From 356f3f41876a6b5617c7c685e4036a0eace92f4c Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Wed, 31 Jul 2024 23:01:27 +0530 Subject: [PATCH 1/4] Signed-off-by: buddhika75 --- .../divudi/ws/lims/MiddlewareController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/main/java/com/divudi/ws/lims/MiddlewareController.java diff --git a/src/main/java/com/divudi/ws/lims/MiddlewareController.java b/src/main/java/com/divudi/ws/lims/MiddlewareController.java new file mode 100644 index 0000000000..136c1d439c --- /dev/null +++ b/src/main/java/com/divudi/ws/lims/MiddlewareController.java @@ -0,0 +1,19 @@ +package com.divudi.ws.lims; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +@Path("/middleware") +public class MiddlewareController { + + @GET + @Produces(MediaType.TEXT_PLAIN) + public Response checkService() { + return Response.ok("Middleware service is working").build(); + } + + // Add your additional middleware-related methods here +} From 4841612cfd1acc27d37f6e92681d62cad4ec1d1f Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Wed, 31 Jul 2024 23:02:53 +0530 Subject: [PATCH 2/4] Signed-off-by: buddhika75 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a079092de0..231feeeb13 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.divudi - ruhunu-dev + sethmademo 3.0.0 war - ruhunu-dev + ruhunu ${project.build.directory}/endorsed From 451ac2658098a69f59c6e92951ce30bd94370ada Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Thu, 1 Aug 2024 21:41:11 +0530 Subject: [PATCH 3/4] Signed-off-by: buddhika75 --- pom.xml | 4 +-- .../divudi/ws/common/ApplicationConfig.java | 2 ++ .../divudi/ws/lims/MiddlewareController.java | 29 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 231feeeb13..c18f25e60d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.divudi - sethmademo + sethma-dev 3.0.0 war - ruhunu + ruhunu-dev ${project.build.directory}/endorsed diff --git a/src/main/java/com/divudi/ws/common/ApplicationConfig.java b/src/main/java/com/divudi/ws/common/ApplicationConfig.java index a6babb840f..7800404ef4 100644 --- a/src/main/java/com/divudi/ws/common/ApplicationConfig.java +++ b/src/main/java/com/divudi/ws/common/ApplicationConfig.java @@ -46,6 +46,8 @@ private void addRestResourceClasses(Set> resources) { resources.add(com.divudi.ws.inward.ApiInward.class); resources.add(com.divudi.ws.lims.Lims.class); resources.add(com.divudi.ws.lims.LimsMiddlewareController.class); + resources.add(com.divudi.ws.lims.MiddlewareController.class); + } } diff --git a/src/main/java/com/divudi/ws/lims/MiddlewareController.java b/src/main/java/com/divudi/ws/lims/MiddlewareController.java index 136c1d439c..46d5f47c2c 100644 --- a/src/main/java/com/divudi/ws/lims/MiddlewareController.java +++ b/src/main/java/com/divudi/ws/lims/MiddlewareController.java @@ -1,5 +1,9 @@ package com.divudi.ws.lims; +import com.divudi.bean.common.ConfigOptionApplicationController; +import javax.inject.Inject; +import javax.json.Json; +import javax.json.JsonObject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -8,12 +12,37 @@ @Path("/middleware") public class MiddlewareController { + + @Inject + ConfigOptionApplicationController configOptionApplicationController; @GET @Produces(MediaType.TEXT_PLAIN) public Response checkService() { return Response.ok("Middleware service is working").build(); } + + @GET + @Path("/test") + @Produces(MediaType.TEXT_PLAIN) + public Response checkServiceTest() { + return Response.ok("Middleware service is working").build(); + } + + @GET + @Path("/pullSampleData") + @Produces(MediaType.APPLICATION_JSON) + public Response pullSampleData() { + String jsonInput = configOptionApplicationController.getLongTextValueByKey("Test Json"); + + // Check if the retrieved JSON string is not null or empty + if (jsonInput == null || jsonInput.trim().isEmpty()) { + return Response.status(Response.Status.NO_CONTENT).build(); + } + + // Return the retrieved JSON string + return Response.ok(jsonInput).build(); + } // Add your additional middleware-related methods here } From b8772994cb1550542ab5c9c18cb73dd5168746d9 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Wed, 7 Aug 2024 21:38:27 +0530 Subject: [PATCH 4/4] Closes #407 Signed-off-by: buddhika75 --- pom.xml | 4 +- .../bean/common/OpdPreBillController.java | 21 +- .../divudi/bean/common/SearchController.java | 5 +- .../divudi/bean/opd/OpdBillController.java | 5 + .../bean/store/StoreAdjustmentController.java | 64 +-- src/main/java/com/divudi/data/Privileges.java | 519 ++---------------- src/main/java/com/divudi/entity/Bill.java | 1 + src/main/resources/META-INF/persistence.xml | 4 +- src/main/webapp/WEB-INF/glassfish-web.xml | 2 +- .../courier/collectSamples.xhtml | 3 +- .../courier/handoverSamplesToLab.xhtml | 1 - .../collecting_centre/courier/index.xhtml | 33 +- .../courier/printReports.xhtml | 1 - .../courier/viewBillReports.xhtml | 1 - .../courier/viewPaymentReports.xhtml | 1 - .../courier/viewReports.xhtml | 14 +- .../courier/viewStatistics.xhtml | 1 - 17 files changed, 119 insertions(+), 561 deletions(-) diff --git a/pom.xml b/pom.xml index 7d4291e618..209701d09e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.divudi - sethma + ruhunu-dev 3.0.0 war - sethma + ruhunu-dev ${project.build.directory}/endorsed diff --git a/src/main/java/com/divudi/bean/common/OpdPreBillController.java b/src/main/java/com/divudi/bean/common/OpdPreBillController.java index c3509760e5..3bd2d8cd7c 100644 --- a/src/main/java/com/divudi/bean/common/OpdPreBillController.java +++ b/src/main/java/com/divudi/bean/common/OpdPreBillController.java @@ -803,6 +803,7 @@ public String settleBill() { } b.setBillItems(list); + b.setIpOpOrCc("OP"); getBillFacade().edit(b); getBillBean().calculateBillItems(b, getLstBillEntries()); @@ -822,14 +823,14 @@ public String settleBill() { saveBillItemSessions(); JsfUtil.addSuccessMessage("Bill Saved"); checkBillValues(); - + if (getToken() != null) { if (getToken().getBill() == null) { getToken().setBill(batchBill); tokenFacade.edit(getToken()); markToken(batchBill); - }else{ - Token t=new Token(); + } else { + Token t = new Token(); t.setPatient(getToken().getPatient()); t.setBill(batchBill); t.setTokenNumber(getToken().getTokenNumber()); @@ -837,9 +838,9 @@ public String settleBill() { getToken().setReferaToken(t); tokenFacade.edit(t); } - - } - + + } + printPreview = true; return "/opd/opd_pre_bill?faces-redirect=true"; @@ -956,6 +957,7 @@ private void saveBatchBill() { newlyCreatingBatchBillPre.setNetTotal(tmpBatchBillTotalOfNetTotals); newlyCreatingBatchBillPre.setDiscount(tmpBatchBillTotalOfDiscounts); + newlyCreatingBatchBillPre.setIpOpOrCc("OP"); newlyCreatingBatchBillPre.setTotal(tmpBatchBillTotalOfGrossTotals); getBillFacade().edit(newlyCreatingBatchBillPre); @@ -1013,7 +1015,7 @@ private PreBill saveBill(Department bt, PreBill updatingPreBill) { updatingPreBill.setReferredByInstitution(referredByInstitution); //updatingPreBill.setCreditCompany(creditCompany); updatingPreBill.setComments(comment); - + updatingPreBill.setIpOpOrCc("OP"); //getBillBean().setPaymentMethodData(updatingPreBill, paymentMethod, getPaymentMethodData()); updatingPreBill.setBillDate(new Date()); @@ -1021,7 +1023,6 @@ private PreBill saveBill(Department bt, PreBill updatingPreBill) { updatingPreBill.setPatient(getPatient()); // updatingPreBill.setMembershipScheme(membershipSchemeController.fetchPatientMembershipScheme(getPatient(), getSessionController().getApplicationPreference().isMembershipExpires())); - //updatingPreBill.setPaymentScheme(getPaymentScheme()); //updatingPreBill.setPaymentMethod(paymentMethod); updatingPreBill.setCreatedAt(new Date()); @@ -1138,7 +1139,6 @@ private boolean errorCheck() { // JsfUtil.addErrorMessage("Select Payment Method."); // return true; // } - // if (getPaymentSchemeController().errorCheckPaymentMethod(paymentMethod, getPaymentMethodData())) { // return true; // } @@ -1162,7 +1162,6 @@ private boolean errorCheck() { // JsfUtil.addErrorMessage("Check Payment method"); // return true; // } - return false; } @@ -1386,7 +1385,7 @@ public void calTotals() { double billDiscount = 0.0; double billGross = 0.0; double billNet = 0.0; - + for (BillEntry be : getLstBillEntries()) { //////// // System.out.println("bill item entry"); double entryGross = 0.0; diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index c1f13489ce..25abd7d014 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -1015,8 +1015,7 @@ public void fillCollectingCentreCourierPatientInvestigations() { + " join pi.billItem.bill b " + " join b.patient.person p " + " where " - + " b.createdAt between :fromDate and :toDate " - + " and pi.investigation.department=:dep "; + + " b.createdAt between :fromDate and :toDate "; Map temMap = new HashMap(); temMap.put("toDate", getToDate()); @@ -1028,7 +1027,7 @@ public void fillCollectingCentreCourierPatientInvestigations() { temMap.put("ccs", sessionController.getLoggableCollectingCentres()); } else { jpql += " and b.collectingCentre=:cc "; - temMap.put("cc", sessionController.getLoggableCollectingCentres()); + temMap.put("cc", institution); } if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) { diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java index 5df2236f82..cf946b4533 100644 --- a/src/main/java/com/divudi/bean/opd/OpdBillController.java +++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java @@ -1750,6 +1750,7 @@ private boolean executeSettleBillActions() { } newSingleBill.setBillItems(list); newSingleBill.setBillTotal(newSingleBill.getNetTotal()); + newSingleBill.setIpOpOrCc("OP"); getBillFacade().edit(newSingleBill); getBillBean().calculateBillItems(newSingleBill, getLstBillEntries()); if (getSessionController().getApplicationPreference().isPartialPaymentOfOpdBillsAllowed()) { @@ -1995,6 +1996,7 @@ private void saveBatchBill() { newBatchBill.setFromInstitution(sessionController.getInstitution()); newBatchBill.setFromDepartment(sessionController.getDepartment()); newBatchBill.setPatient(patient); + newBatchBill.setIpOpOrCc("OP"); newBatchBill.setInsId( getBillNumberGenerator().institutionBillNumberGenerator( getSessionController().getInstitution(), @@ -2096,7 +2098,9 @@ private Bill saveBill(Department bt, Bill newBill) { newBill.setCreditCompany(creditCompany); newBill.setCollectingCentre(collectingCentre); + newBill.setIpOpOrCc("OP"); newBill.setComments(comment); + getBillBean().setPaymentMethodData(newBill, paymentMethod, getPaymentMethodData()); @@ -2178,6 +2182,7 @@ private Bill saveBill(Department bt, Category cat, Bill newBill) { newBill.setCreditCompany(creditCompany); newBill.setCollectingCentre(collectingCentre); newBill.setComments(comment); + newBill.setIpOpOrCc("OP"); getBillBean().setPaymentMethodData(newBill, paymentMethod, getPaymentMethodData()); diff --git a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java index 63805f5b0f..aee53e61dc 100644 --- a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java +++ b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java @@ -664,38 +664,38 @@ public void setStk(List stk) { this.stk = stk; } - public void fillSelectStock() { - List items = new ArrayList<>(); - if (stock == null) { - stk = items; - return; - } - String sql; - Map m = new HashMap<>(); - - sql = "select i " - + " from Stock i " - + " where i.department=:d " - + " and i.itemBatch.item.code=:stationary " - + " order by i.stock desc"; - - m.put("d", sessionController.getDepartment()); - m.put("stationary", stock.getItemBatch().getItem().getCode()); // Assuming stk contains the item - - items = getStockFacade().findByJpql(sql, m); - - if (items != null) { - stk = items; - } - } - - public List getStk() { - return stk; - } - - public void setStk(List stk) { - this.stk = stk; - } +// public void fillSelectStock() { +// List items = new ArrayList<>(); +// if (stock == null) { +// stk = items; +// return; +// } +// String sql; +// Map m = new HashMap<>(); +// +// sql = "select i " +// + " from Stock i " +// + " where i.department=:d " +// + " and i.itemBatch.item.code=:stationary " +// + " order by i.stock desc"; +// +// m.put("d", sessionController.getDepartment()); +// m.put("stationary", stock.getItemBatch().getItem().getCode()); // Assuming stk contains the item +// +// items = getStockFacade().findByJpql(sql, m); +// +// if (items != null) { +// stk = items; +// } +// } +// +// public List getStk() { +// return stk; +// } +// +// public void setStk(List stk) { +// this.stk = stk; +// } // public void fillSelectStock(){ // List items = new ArrayList<>(); diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java index 742ec44ab8..a441740357 100644 --- a/src/main/java/com/divudi/data/Privileges.java +++ b/src/main/java/com/divudi/data/Privileges.java @@ -6,491 +6,42 @@ public enum Privileges { - //Main Menu Privileges - TheaterIssueBHT, - Opd, - Inward, - Lab, - Pharmacy, - Payment, - Hr, - Reports, - User, - Admin, - Channelling, - Clinical, - Store, - Search, - CashTransaction, - ChangeCreditLimitInCC, - //Submenu Privileges - OpdBilling, - OpdCollectingCentreBillingMenu, - OpdCollectingCentreBilling, - OpdCollectingCentreBillSearch, - OpdPreBilling, - OpdBillSearch, - OpdBillItemSearch, - OpdReprint, - OpdCancel, - OpdReturn, - OpdReactivate, - OpdBillSearchEdit, - OpdLabReportSearch, - OpdReprintOriginalBill, - OpdAddNewRefferalDoctor, - OpdAddNewCollectingCentre, + // Main Menu Privileges + TheaterIssueBHT("Theater Issue BHT"), + Opd("OPD"), + Inward("Inward"), + Lab("Lab"), + Pharmacy("Pharmacy"), + Payment("Payment"), + Hr("HR"), + Reports("Reports"), + User("User"), + Admin("Admin"), + Channelling("Channelling"), + Clinical("Clinical"), + Store("Store"), + Search("Search"), + CashTransaction("Cash Transaction"), + ChangeCreditLimitInCC("Change Credit Limit in Collecting Centre"), + + // Submenu Privileges + OpdBilling("OPD Billing"), + OpdCollectingCentreBillingMenu("OPD Collecting Centre Billing Menu"), + OpdCollectingCentreBilling("OPD Collecting Centre Billing"), + OpdCollectingCentreBillSearch("OPD Collecting Centre Bill Search"), + OpdPreBilling("OPD Pre Billing"), + OpdBillSearch("OPD Bill Search"), + OpdBillItemSearch("OPD Bill Item Search"), + OpdReprint("OPD Reprint"), + OpdCancel("OPD Cancel"), + OpdReturn("OPD Return"), + OpdReactivate("OPD Reactivate"), + OpdBillSearchEdit("OPD Bill Search Edit"), + OpdLabReportSearch("OPD Lab Report Search"), + OpdReprintOriginalBill("OPD Reprint Original Bill"), + OpdAddNewRefferalDoctor("OPD Add New Referral Doctor"), + OpdAddNewCollectingCentre("OPD Add New Collecting Centre"), - AddCreditLimitInRegistration, - - InwardAdmissions, - InwardAdmissionsAdmission, - InwardAdmissionsEditAdmission, - InwardAdmissionsInwardAppoinment, - InwardRoom, - InwardRoomRoomOccupency, - InwardRoomRoomChange, - InwardRoomGurdianRoomChange, - InwardRoomDischarge, - InwardServicesAndItems, - InwardServicesAndItemsAddServices, - InwardServicesAndItemsAddOutSideCharges, - InwardServicesAndItemsAddProfessionalFee, - InwardServicesAndItemsAddTimedServices, - InwardBilling, - InwardBillingInterimBill, - InwardBillingInterimBillSearch, - InwardSearch, - InwardSearchServiceBill, - InwardSearchProfessionalBill, - InwardSearchFinalBill, - InwardReport, - InwardFinalBillReportEdit, - InwardAdministration, - InwardAdditionalPrivilages, - InwardBillSearch, - InwardBillItemSearch, - InwardBillReprint, - InwardCancel, - InwardReturn, - InwardReactivate, - InwardCheck, - InwardUnCheck, - InwardFinalBillCancel, - InwardOutSideMarkAsUnPaid, - ShowInwardFee, - InwardPharmacyMenu, - InwardPharmacyIssueRequest, - InwardPharmacyIssueRequestSearch, - InwardBillSettleWithoutCheck, - LabBilling, - LabBillCancelSpecial, - LabBillRefundSpecial, - LabCasheirBillSearch, - LabCashier, - LabBillSearchCashier, - LabBillSearch, - LabBillItemSearch, - LabBillCancelling, - CollectingCentreCancelling, - LabBillReturning, - LabBillReprint, - LabBillRefunding, - LabBillReactivating, - LabSampleCollecting, - LabSampleReceiving, - LabReportFormatEditing, - LabDataentry, - LabAutherizing, - LabDeAutherizing, - LabRevertSample, - LabPrinting, - LabReprinting, - LabReportEdit, - LabReportPrint, - AdminReportSearch, - LabReportSearchByDepartment, - LabSummeries, - LabSummeriesLevel1, - LabSummeriesLevel2, - LabSummeriesLevel3, - LabReportSearchOwn, - LabReportSearchAll, - LabReceive, - LabEditPatient, - LabInvestigationFee, - LabAddInwardServices, - LabReportSearchByLoggedInstitution, - IncomeReport, - LabReport, - DuesAndAccess, - CheckEnteredData, - LabAdiministrator, - LabReports, - LabItems, - LabItemFeeUpadate, - LabItemFeeDelete, - LabPatientDetailsEdit, - LabLists, - LabSetUp, - LabInwardBilling, - LabInwardSearchServiceBill, - LabCollectingCentreBilling, - LabCCBilling, - LabCCBillingSearch, - LabReportSearch, - LabReporting, - //dont remove - LabSearchBillLoggedInstitution, - PaymentBilling, - PaymentBillSearch, - PaymentBillReprint, - PaymentBillCancel, - PaymentBillRefund, - PaymentBillReactivation, - ReportsSearchCashCardOwn, - ReportsSearchCreditOwn, - ReportsItemOwn, - ReportsSearchCashCardOther, - ReportSearchCreditOther, - ReportsItemOther, - PharmacyOrderCreation, - PharmacyOrderApproval, - PharmacyOrderCancellation, - PharmacySaleWithoutStock, - PharmacySaleReprint, - PharmacySaleCancel, - PharmacySaleReturn, - //Wholesale - PharmacySaleWh, - PharmacySaleReprintWh, - PharmacySaleCancelWh, - PharmacySaleReturnWh, - //end wholesale - PharmacyInwardBilling, - PharmacyInwardBillingCancel, - PharmacyInwardBillingReturn, - PharmacyGoodReceive, - //Wholesale - PharmacyGoodReceiveWh, - //end Wholesale - PharmacyGoodReceiveCancel, - PharmacyGoodReceiveReturn, - PharmacyGoodReceiveEdit, - PharmacyPurchase, - //Wholesale - PharmacyPurchaseWh, - //theater - Theatre, - TheatreAddSurgery, - TheatreBilling, - TheaterTransfer, - TheaterTransferRequest, - TheaterTransferIssue, - TheaterTransferRecieve, - TheaterTransferReport, - TheaterReports, - TheaterSummeries, - TheaterIssue, - TheaterIssuePharmacy, - TheaterIssueStore, - TheaterIssueStoreBhtBilling, - TheaterIssueStoreBhtSearchBill, - TheaterIssueStoreBhtSearchBillItem, - TheaterIssueOpd, - TheaterIssueOpdForCasheir, - TheaterIssueOpdSearchPreBill, - TheaterIssueOpdSearchPreBillForReturnItemOnly, - TheaterIssueOpdSearchPreBillReturn, - TheaterIssueOpdSearchPreBillAddToStock, - ClinicalPatientSummery, - ClinicalPatientDetails, - ClinicalPatientPhoto, - ClinicalVisitDetail, - ClinicalVisitSummery, - ClinicalHistory, - ClinicalAdministration, - ClinicalPatientDelete, - ChannelAdd, - ChannelCancel, - ChannelRefund, - ChannelReturn, - ChannelView, - ChannelDoctorPayments, - ChannelDoctorPaymentCancel, - ChannelViewHistory, - ChannelCreateSessions, - ChannelCreateSpecialSessions, - ChannelManageSessions, - ChannelAdministration, - ChannelAgencyReports, - AdminManagingUsers, - AdminInstitutions, - AdminStaff, - AdminItems, - AdminPrices, - AdminFilterWithoutDepartment, - ChangeProfessionalFee, - ChangeCollectingCentre, - StoreIssue, - StoreIssueInwardBilling, - StoreIssueSearchBill, - StoreIssueBillItems, - StorePurchase, - StorePurchaseOrder, - StorePurchaseOrderApprove, - StorePurchaseOrderApproveSearch, - StorePurchaseGRNRecive, - StorePurchaseGRNReturn, - StorePurchasePurchase, - StoreTransfer, - StoreTransferRequest, - StoreTransferIssue, - StoreTransferRecive, - StoreTransferReport, - StoreAdjustment, - StoreAdjustmentDepartmentStock, - StoreAdjustmentStaffStock, - StoreAdjustmentPurchaseRate, - StoreAdjustmentSaleRate, - StoreDealorPayment, - StoreDealorPaymentDueSearch, - StoreDealorPaymentDueByAge, - StoreDealorPaymentPayment, - StoreDealorPaymentPaymentGRN, - StoreDealorPaymentPaymentGRNSelect, - StoreDealorPaymentGRNDoneSearch, - StoreSearch, - StoreReports, - StoreSummery, - StoreAdministration, - SearchGrand, - CashTransactionCashIn, - CashTransactionCashOut, - CashTransactionListToCashRecieve, - ChannellingChannelBooking, - ChannellingFutureChannelBooking, - ChannellingPastBooking, - ChannellingBookedList, - ChannellingDoctorLeave, - ChannellingDoctorLeaveByDate, - ChannellingDoctorLeaveByServiceSession, - ChannellingChannelSheduling, - ChannellingSpecialChannelSheduling, - ChannellingChannelShedulRemove, - ChannellingChannelShedulName, - ChannellingChannelShedulStartingNo, - ChannellingChannelShedulRoomNo, - ChannellingChannelShedulMaxRowNo, - ChannellingChannelAgentFee, - ChannellingDoctorSessionView, - ChannellingPayment, - ChannellingPaymentPayDoctor, - ChannellingPaymentDueSearch, - ChannellingPaymentDoneSearch, - ChannellingApoinmentNumberCountEdit, - ChannellingEditSerialNo, - ChannellingEditPatientDetails, - ChannellingPrintInPastBooking, - ChannellingEditCreditLimitUserLevel, - ChannellingEditCreditLimitAdminLevel, - ChannellingReprintOriginalBill, - ChannellingPastBookingPatientAttend, - ChannelReports, - ChannelSummery, - ChannelManagement, - ChannelAgencyAgencies, - ChannelAgencyCreditLimitUpdate, - ChannelAgencyCreditLimitUpdateBulk, - ChannelAddChannelBookToAgency, - ChannelManageSpecialities, - ChannelManageConsultants, - ChannelEditingAppoinmentCount, - ChannelAddChannelingConsultantToInstitutions, - ChannelFeeUpdate, - ChannelCrdeitNote, - ChannelCrdeitNoteSearch, - ChannelDebitNote, - ChannelDebitNoteSearch, - ChannelCashCancelRestriction, - ChannelBookingChange, - ChannelBookingBokking, - ChannelBookingReprint, - ChannelBookingCancel, - ChannelBookingRefund, - ChannelBookingSettle, - ChannelBookingSearch, - ChannelBookingViews, - ChannelBookingDocPay, - ChannelBookingRestric, - ChannelCashierTransaction, - ChannelCashierTransactionIncome, - ChannelCashierTransactionIncomeSearch, - ChannelCashierTransactionExpencess, - ChannelCashierTransactionExpencessSearch, - ChannelActiveVat, - MemberShip, - MemberShipAdd, - MemberShipEdit, - MembershipReports, - MembershipDiscountManagement, - MembershipAdministration, - MembershipSchemes, - MemberShipInwardMemberShip, - MemberShipInwardMemberShipSchemesDicounts, - MemberShipInwardMemberShipInwardMemberShipReport, - MemberShipOpdMemberShipDis, - MemberShipOpdMemberShipDisByDepartment, - MemberShipOpdMemberShipDisByCategory, - MemberShipOpdMemberShipDisOpdMemberShipReport, - MemberShipMemberDeActive, - MemberShipMemberReActive, - HrAdmin, - HrReports, - HrReportsLevel1, - HrReportsLevel2, - HrReportsLevel3, - EmployeeHistoryReport, - hrDeleteLateLeave, - HrGenerateSalary, - HrGenerateSalarySpecial, - HrAdvanceSalary, - HrPrintSalary, - HrWorkingTime, - HrRosterTable, - HrUploadAttendance, - HrAnalyseAttendenceByRoster, - HrAnalyseAttendenceByStaff, - HrForms, - HrLeaveForms, - HrAdditionalForms, - HrEditRetiedDate, - HrRemoveResignDate, - Developers, - //Cashier - AllCashierSummery, - //Administration - SearchAll, - ChangePreferece, - SendBulkSMS, - ClinicalAdministrationEditLetter, - ClinicalPatientAdd, - ClinicalPatientEdit, - ClinicalPatientCommentsView, - ClinicalPatientCommentsEdit, - ClinicalPatientNameChange, - ClinicalMembershipAdd, - ClinicalMembershipEdit, - ClinicalPatientPhoneNumberEdit, - //Pharmacy Disbursement - PharmacyDisburesementMenu, - PharmacyDisbursementRequest, - PharmacyDisbursementIssurForRequest, - PharmacyDisbursementDirectIssue, - PharmacyDisbursementRecieve, - PharmacyDisbursementReports, - //Pharmacy Inpatient medication management - InpatientMedicationManagementMenue, - PharmacyDirectIssueToBht, - PharmacyDirectIssueToTheaterCases, - PharmacyBhtIssueRequest, - PharmacySearchInpatientDirectIssuesbyBill, - PharmacySearchInpatientDirectIssuesbyItem, - PharmacySearchInpatientDirectIssueReturnsbyBill, - PharmacysSearchInpatientDirectIssueReturnsbyItem, - //Pharmacy Retail Transactions - PharmacyRetailTransactionMenue, - PharmacyRetailTransaction, - PharmacySale, - PharmacySaleForCashier, - PharmacySaleWithOutStock, - PharmacySearchSaleBill, - PharmacySearchSalePreBill, - PharmacySearchSaleBillItems, - PharmacyReturnItemsOnly, - PharmacyReturnItemsAndPayments, - PharmacySearchReturnBill, - PharmacyAddToStock, - //Pharmacy Wholesale Transaction - PharmacyWholeSaleTransactionMenue, - PharmacyWholeSaleTransaction, - PharmacyWholesaleSale, - PharmacyWholesaleSaleForCashier, - PharmacyWholesaleSearchSaleBill, - PharmacyWholesaleSearchSaleBillToPay, - PharmacyWholesaleSearchSaleBillItems, - PharmacyWholesaleReturnItemsOnly, - PharmacyWholesaleWholeSaleAddToStock, - PharmacyWholeSalePurchase, - PharmacySearchReturnBillItems, - //Pharmacy Disposal - PharmacyDisposalMenue, - PharmacyDisposalIssue, - PharmacyDisposalSearchIssueBill, - PharmacyDisposalSearchIssueBillItems, - PharmacyDisposalSearchIssueReturnBill, - PharmacyDisposalUnitIssueMargin, - //Pharmacy Adjustment - PharmacyAdjustmentMenue, - PharmacyAdjustmentDepartmentStockQTY, - PharmacyAdjustmentDepartmentStockBySingleItemQTY, - PharmacyAdjustmentStaffStockAdjustment, - PharmacyAdjustmentPurchaseRate, - PharmacyAdjustmentSaleRate, - PharmacyAdjustmentWholeSaleRate, - PharmacyAdjustmentExpiryDate, - PharmacyAdjustmentSearchAdjustmentBills, - PharmacyAdjustmentTransferAllStock, - //Pharmacy Dealer Payments - PharmacyDealerPaymentMenue, - PharmacyDealerDueSearch, - PharmacyDealerDueByAge, - PharmacyPayment, - PharmacyGRNPaymentApprove, - PharmacyGRNPaymentDoneSearch, - PharmacyCreditDueAndAccess, - //Whalesale - PharmacyWholesaleMenue, - PharmacyPurchaseReprint, - PharmacyPurchaseCancellation, - PharmacyPurchaseReturn, - PharmacyStockAdjustment, - PharmacyStockAdjustmentSingleItem, - PharmacyReAddToStock, - PharmacyStockIssue, - PharmacyDealorPayment, - PharmacySearch, - PharmacyReports, - PharmacyTransfer, - PharmacySummery, - PharmacyAdministration, - PharmacySetReorderLevel, - PharmacyReturnWithoutTraising, - PharmacyBHTIssueAccept, - //Pharmacy Procurement - PharmacyProcurementMenu, - CreatePurchaseOrder, - AutoOrderPModel, - AutoOrderQModal, - DirectPurchase, - PurchaseOrdersApprovel, - TransferReciveApproval, - GoodsRecipt, - ReturnReceviedGoods, - ReturnWithoutRecipt, - // - PharmacyItemSearch, - PharmacyGenarateReports, - PharmacySummaryViews, - //Optician - Optician, - OpticianPatientManagement, - OpticianAppointmentManagement, - OpticianEmr, - OpticianStockManagement, - OpticianProductCatalog, - OpticianRepairManagement, - AddCreditLimitInRegistration("Add Credit Limit in Registration"), InwardAdmissions("Inward Admissions"), diff --git a/src/main/java/com/divudi/entity/Bill.java b/src/main/java/com/divudi/entity/Bill.java index d62657feb8..5121eaf2fc 100644 --- a/src/main/java/com/divudi/entity/Bill.java +++ b/src/main/java/com/divudi/entity/Bill.java @@ -820,6 +820,7 @@ public void copy(Bill bill) { vat = bill.getVat(); vatPlusNetTotal = bill.getVatPlusNetTotal(); sessionId = bill.getSessionId(); + ipOpOrCc=bill.getIpOpOrCc(); // referenceBill=bill.getReferenceBill(); } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index a64d5abce9..4c55aeaa6e 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,7 +2,7 @@ org.eclipse.persistence.jpa.PersistenceProvider - jdbc/arogya + jdbc/ruhunuDemo false @@ -10,7 +10,7 @@ - jdbc/arogyaAudit + jdbc/ruhunuDemoAudit com.divudi.entity.AuditEvent true diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml index 2ef047d83a..a07bb18d6a 100644 --- a/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/src/main/webapp/WEB-INF/glassfish-web.xml @@ -1,7 +1,7 @@ - /sethma + /ruhuna-dev diff --git a/src/main/webapp/collecting_centre/courier/collectSamples.xhtml b/src/main/webapp/collecting_centre/courier/collectSamples.xhtml index 23259e17b7..55d1263cd8 100644 --- a/src/main/webapp/collecting_centre/courier/collectSamples.xhtml +++ b/src/main/webapp/collecting_centre/courier/collectSamples.xhtml @@ -1,7 +1,6 @@ @@ -11,7 +10,7 @@ You are NOT Authorized to view Collect Samples Page - +

Collect Samples

Dummy content for Collect Samples page.

diff --git a/src/main/webapp/collecting_centre/courier/handoverSamplesToLab.xhtml b/src/main/webapp/collecting_centre/courier/handoverSamplesToLab.xhtml index 3c181ce141..9e69416927 100644 --- a/src/main/webapp/collecting_centre/courier/handoverSamplesToLab.xhtml +++ b/src/main/webapp/collecting_centre/courier/handoverSamplesToLab.xhtml @@ -1,7 +1,6 @@ diff --git a/src/main/webapp/collecting_centre/courier/index.xhtml b/src/main/webapp/collecting_centre/courier/index.xhtml index e2af365ede..4749318d73 100644 --- a/src/main/webapp/collecting_centre/courier/index.xhtml +++ b/src/main/webapp/collecting_centre/courier/index.xhtml @@ -8,20 +8,27 @@
-
-
- - - - - - - - - -
+ +
+
+ + + + + + + + -
+
+
+ +
+
diff --git a/src/main/webapp/collecting_centre/courier/printReports.xhtml b/src/main/webapp/collecting_centre/courier/printReports.xhtml index 69a0fb845f..9a08fb6e26 100644 --- a/src/main/webapp/collecting_centre/courier/printReports.xhtml +++ b/src/main/webapp/collecting_centre/courier/printReports.xhtml @@ -1,7 +1,6 @@ diff --git a/src/main/webapp/collecting_centre/courier/viewBillReports.xhtml b/src/main/webapp/collecting_centre/courier/viewBillReports.xhtml index bf71097593..0532eae4aa 100644 --- a/src/main/webapp/collecting_centre/courier/viewBillReports.xhtml +++ b/src/main/webapp/collecting_centre/courier/viewBillReports.xhtml @@ -1,7 +1,6 @@ diff --git a/src/main/webapp/collecting_centre/courier/viewPaymentReports.xhtml b/src/main/webapp/collecting_centre/courier/viewPaymentReports.xhtml index 0d22b639e9..ed895eb62a 100644 --- a/src/main/webapp/collecting_centre/courier/viewPaymentReports.xhtml +++ b/src/main/webapp/collecting_centre/courier/viewPaymentReports.xhtml @@ -1,7 +1,6 @@ + value="Collecting Centre*"/> - - - - + -
diff --git a/src/main/webapp/collecting_centre/courier/viewStatistics.xhtml b/src/main/webapp/collecting_centre/courier/viewStatistics.xhtml index cc4f04ddc9..865fea31ef 100644 --- a/src/main/webapp/collecting_centre/courier/viewStatistics.xhtml +++ b/src/main/webapp/collecting_centre/courier/viewStatistics.xhtml @@ -1,7 +1,6 @@