From e5a57f3f64d16902ed638e3a5223b74b3eb61ba1 Mon Sep 17 00:00:00 2001 From: Buddhika Date: Sat, 14 Dec 2024 17:08:40 +0530 Subject: [PATCH 01/66] Signed-off-by: Buddhika --- src/main/resources/META-INF/persistence.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 843440cd1f..1e9836c60d 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/ruhunu + jdbc/arogya false From ec54095015b3f4213fc23be0b071fef8572a47a6 Mon Sep 17 00:00:00 2001 From: Pubudu-Piyankara Date: Mon, 30 Dec 2024 20:27:08 +0530 Subject: [PATCH 02/66] Signed-off-by: Pubudu-Piyankara --- .../bean/pharmacy/PharmacyController.java | 42 +++++++------------ .../stock_transfer_report.xhtml | 29 +++++++++++++ 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java index c577bee323..5645d12ccd 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java @@ -847,33 +847,34 @@ public void generateGRNReportTableByBillItem(List bt) { } public String navigateToPrinteGeneratedGrnDetailedRportTable() { - if(bills==null){ + if (bills == null) { JsfUtil.addErrorMessage("No Bills"); return null; } - if(bills.isEmpty()){ + if (bills.isEmpty()) { JsfUtil.addErrorMessage("Bill List Empty"); return null; } - for(Bill b:bills){ - if(b.getBillItems()==null || b.getBillItems().isEmpty()){ - b.setBillItems(billService.fetchBillItems(b)); + for (Bill b : bills) { + if (b.getBillItems() == null || b.getBillItems().isEmpty()) { + b.setBillItems(billService.fetchBillItems(b)); } } return "/reports/inventoryReports/grn_report_detail_print?faces-redirect=true"; } + public String navigateToPrinteGeneratedGrnReturnReportTable() { - if(bills==null){ + if (bills == null) { JsfUtil.addErrorMessage("No Bills"); return null; } - if(bills.isEmpty()){ + if (bills.isEmpty()) { JsfUtil.addErrorMessage("Bill List Empty"); return null; } - for(Bill b:bills){ - if(b.getBillItems()==null || b.getBillItems().isEmpty()){ - b.setBillItems(billService.fetchBillItems(b)); + for (Bill b : bills) { + if (b.getBillItems() == null || b.getBillItems().isEmpty()) { + b.setBillItems(billService.fetchBillItems(b)); } } return "/reports/inventoryReports/grn_report_return_print?faces-redirect=true"; @@ -881,9 +882,8 @@ public String navigateToPrinteGeneratedGrnReturnReportTable() { public String navigateBackToGeneratedGrnDetailedRportTable() { return "/reports/inventoryReports/grn_report?faces-redirect=true"; - } + } - public void generateGRNReportTable() { bills = null; totalCreditPurchaseValue = 0.0; @@ -983,8 +983,8 @@ private void resetFields() { } public void generateConsumptionReportTableByBill(BillType billType) { - List bt = new ArrayList<>(); - bt.add(BillType.PharmacyIssue); +// List bt = new ArrayList<>(); +// bt.add(BillType.PharmacyIssue); bills = new ArrayList<>(); String sql = "SELECT b FROM Bill b WHERE b.retired = false" @@ -1091,7 +1091,6 @@ public void generateConsumptionReportTableByBillItems(BillType billType) { } } - @Deprecated public void generateConsumptionReportTableAsSummary(BillType billType) { // Initialize bill types List bt = new ArrayList<>(); @@ -1488,6 +1487,7 @@ public List calculateTotalsForBillItems(List billItemLi } public void createStockTransferReport() { + resetFields(); BillType bt; if ("issue".equals(transferType)) { @@ -1497,24 +1497,12 @@ public void createStockTransferReport() { } if ("summeryReport".equals(reportType)) { - - bills = null; - departmentSummaries = null; - issueDepartmentCategoryWiseItems = null; generateConsumptionReportTableAsSummary(bt); } else if ("detailReport".equals(reportType)) { - - billItems = null; - departmentSummaries = null; - issueDepartmentCategoryWiseItems = null; generateConsumptionReportTableByBillItems(bt); } else if ("byBill".equals(reportType)) { - - bills = null; - billItems = null; - issueDepartmentCategoryWiseItems = null; generateConsumptionReportTableByBill(bt); } diff --git a/src/main/webapp/reports/inventoryReports/stock_transfer_report.xhtml b/src/main/webapp/reports/inventoryReports/stock_transfer_report.xhtml index 5e69e6679b..1d13073e4e 100644 --- a/src/main/webapp/reports/inventoryReports/stock_transfer_report.xhtml +++ b/src/main/webapp/reports/inventoryReports/stock_transfer_report.xhtml @@ -336,6 +336,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8e4b249330d5609d1870aa8d3791a6ccf7a8bb31 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:14:49 +0530 Subject: [PATCH 03/66] Create build.yml --- .github/workflows/build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..c980b0dd06 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,14 @@ +name: Build + +on: + push: + branches: + - dev-ci-cd-setup + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Printing Hello Build + run: echo 'Hello, Build!' From 522e9caf4d420049eed6f7fe781a1f8df66c39e3 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:20:52 +0530 Subject: [PATCH 04/66] Create deploy.yml --- .github/workflows/deploy.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000000..fe5be59a36 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,22 @@ +name: Deploy + +on: + workflow_run: + workflows: [Build] + types: [completed] + +jobs: + on-success: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} + + steps: + - name: Print Hello Deploy + run: echo 'Hello, Deploy!' + on-failure: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'failure' }} + + steps: + - name: Print Build failed message + run: echo 'Build failed.' From a85796e1deece7d07e33959d2d0398182a373808 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:28:35 +0530 Subject: [PATCH 05/66] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c980b0dd06..bf741d6f02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,4 +11,6 @@ jobs: steps: - name: Printing Hello Build - run: echo 'Hello, Build!' + run: | + sleep 5 + echo 'Hello, Build!' From 84dd9f85a3695b3db86d7f2e5a24c5fe7c5dd012 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:34:47 +0530 Subject: [PATCH 06/66] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fe5be59a36..aecad44818 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: Deploy on: workflow_run: - workflows: [Build] + workflows: ["Build"] types: [completed] jobs: From 61cb8263a999e40715c265fad46eaab7c7328940 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:43:29 +0530 Subject: [PATCH 07/66] Delete .github/workflows/deploy.yml --- .github/workflows/deploy.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index aecad44818..0000000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Deploy - -on: - workflow_run: - workflows: ["Build"] - types: [completed] - -jobs: - on-success: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - - steps: - - name: Print Hello Deploy - run: echo 'Hello, Deploy!' - on-failure: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'failure' }} - - steps: - - name: Print Build failed message - run: echo 'Build failed.' From 3cc301d15b893d51619cf589380262d2e4efed23 Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:51:29 +0530 Subject: [PATCH 08/66] Update and rename build.yml to manual_deployment.yml --- .github/workflows/build.yml | 16 ----------- .github/workflows/manual_deployment.yml | 36 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 16 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/manual_deployment.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index bf741d6f02..0000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Build - -on: - push: - branches: - - dev-ci-cd-setup - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Printing Hello Build - run: | - sleep 5 - echo 'Hello, Build!' diff --git a/.github/workflows/manual_deployment.yml b/.github/workflows/manual_deployment.yml new file mode 100644 index 0000000000..f910278e65 --- /dev/null +++ b/.github/workflows/manual_deployment.yml @@ -0,0 +1,36 @@ +name: Manual Deployment + +on: + workflow_dispatch: + inputs: + logLevel: + description: 'Log level selection' + required: true + default: 'warning' + type: choice + options: + - info + - warning + - debug + tags: + description: 'Test scenario tags' + required: false + type: boolean + environment: + description: 'Environment to run tests againsts' + type: environment + required: true + +jobs: + log-the-inputs: + runs-on: ubuntu-latest + + steps: + - run: | + echo "Log level: $LEVEL" + echo "Tags: $TAGS" + echo "Environment: $ENVIRONMENT" + env: + LEVEL: ${{ inputs.logLevel }} + TAGS: ${{ inputs.tags }} + ENVIRONMENT: ${{ inputs.environment }} From 292f04cddb3c9edd160d553d012a7318fd74564a Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:53:34 +0530 Subject: [PATCH 09/66] Delete .github/workflows/manual_deployment.yml --- .github/workflows/manual_deployment.yml | 36 ------------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/manual_deployment.yml diff --git a/.github/workflows/manual_deployment.yml b/.github/workflows/manual_deployment.yml deleted file mode 100644 index f910278e65..0000000000 --- a/.github/workflows/manual_deployment.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Manual Deployment - -on: - workflow_dispatch: - inputs: - logLevel: - description: 'Log level selection' - required: true - default: 'warning' - type: choice - options: - - info - - warning - - debug - tags: - description: 'Test scenario tags' - required: false - type: boolean - environment: - description: 'Environment to run tests againsts' - type: environment - required: true - -jobs: - log-the-inputs: - runs-on: ubuntu-latest - - steps: - - run: | - echo "Log level: $LEVEL" - echo "Tags: $TAGS" - echo "Environment: $ENVIRONMENT" - env: - LEVEL: ${{ inputs.logLevel }} - TAGS: ${{ inputs.tags }} - ENVIRONMENT: ${{ inputs.environment }} From 8760d6f726363a27c82e12dadaa9ba6ae04cf63d Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 23:01:02 +0530 Subject: [PATCH 10/66] Create dev_dispatch.yml --- .github/workflows/dev_dispatch.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/dev_dispatch.yml diff --git a/.github/workflows/dev_dispatch.yml b/.github/workflows/dev_dispatch.yml new file mode 100644 index 0000000000..1dd7868d8a --- /dev/null +++ b/.github/workflows/dev_dispatch.yml @@ -0,0 +1,12 @@ +name: Dev Dispatch + +on: + workflow_dispatch: + +jobs: + msg-print: + runs-on: ubuntu-latest + + steps: + - name: Print + run: echo "Message printing..." From 582070b327f6080d93e6ae8a88edd66c0215ac6f Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 23:09:05 +0530 Subject: [PATCH 11/66] Delete .github/workflows/dev_dispatch.yml --- .github/workflows/dev_dispatch.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/workflows/dev_dispatch.yml diff --git a/.github/workflows/dev_dispatch.yml b/.github/workflows/dev_dispatch.yml deleted file mode 100644 index 1dd7868d8a..0000000000 --- a/.github/workflows/dev_dispatch.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Dev Dispatch - -on: - workflow_dispatch: - -jobs: - msg-print: - runs-on: ubuntu-latest - - steps: - - name: Print - run: echo "Message printing..." From 350b8f6b9f59ba07de18dda95020de8e5947643c Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 22:54:54 +0530 Subject: [PATCH 12/66] Create custom_deployment.yml --- .github/workflows/custom_deployment.yml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/custom_deployment.yml diff --git a/.github/workflows/custom_deployment.yml b/.github/workflows/custom_deployment.yml new file mode 100644 index 0000000000..f910278e65 --- /dev/null +++ b/.github/workflows/custom_deployment.yml @@ -0,0 +1,36 @@ +name: Manual Deployment + +on: + workflow_dispatch: + inputs: + logLevel: + description: 'Log level selection' + required: true + default: 'warning' + type: choice + options: + - info + - warning + - debug + tags: + description: 'Test scenario tags' + required: false + type: boolean + environment: + description: 'Environment to run tests againsts' + type: environment + required: true + +jobs: + log-the-inputs: + runs-on: ubuntu-latest + + steps: + - run: | + echo "Log level: $LEVEL" + echo "Tags: $TAGS" + echo "Environment: $ENVIRONMENT" + env: + LEVEL: ${{ inputs.logLevel }} + TAGS: ${{ inputs.tags }} + ENVIRONMENT: ${{ inputs.environment }} From d97419fcfec7c2c98a12e8c9af06956433b452ba Mon Sep 17 00:00:00 2001 From: Geeth Sandaru Madhushan Date: Mon, 30 Dec 2024 23:07:17 +0530 Subject: [PATCH 13/66] Update custom_deployment.yml --- .github/workflows/custom_deployment.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/custom_deployment.yml b/.github/workflows/custom_deployment.yml index f910278e65..50aadfe1b2 100644 --- a/.github/workflows/custom_deployment.yml +++ b/.github/workflows/custom_deployment.yml @@ -13,13 +13,9 @@ on: - warning - debug tags: - description: 'Test scenario tags' - required: false - type: boolean - environment: - description: 'Environment to run tests againsts' - type: environment + description: 'Tags of the workflow' required: true + type: string jobs: log-the-inputs: @@ -29,8 +25,6 @@ jobs: - run: | echo "Log level: $LEVEL" echo "Tags: $TAGS" - echo "Environment: $ENVIRONMENT" env: LEVEL: ${{ inputs.logLevel }} TAGS: ${{ inputs.tags }} - ENVIRONMENT: ${{ inputs.environment }} From 39c9a3bd2d897fb4ca09ed60a2cb45ca0fa98ee0 Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Tue, 31 Dec 2024 11:00:27 +0530 Subject: [PATCH 14/66] Signed-off-by: Dr M H B Ariyaratne --- .../css/sale_bill_five_five_custom_3.css | 9 +- .../sale_bill_five_five_custom_3.xhtml | 606 +++++++++++------- 2 files changed, 366 insertions(+), 249 deletions(-) diff --git a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css index 83092fe0a5..f1d0bb2b76 100644 --- a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css +++ b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css @@ -13,10 +13,11 @@ /* Header */ .hospital-name { - text-align: center; - font-weight: bold; - font-size: 16px; /* Larger font for hospital name */ - text-transform: uppercase; + font-family: "Courier New", "Liberation Mono", monospace !important; + text-align: center!important; + font-weight: bold!important; + font-size: 18px!important; /* Larger font for hospital name */ + text-transform: uppercase!important; } .hospital-details { diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 5d275895da..951e44273b 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -7,286 +7,402 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui"> + + + + - - - - - + + + + + + + - - + + + - - - -
-
- - - -
- -
- -
-
- + +
+ +
+
+
+
-
- +
+ + +
-
- - -
-
-
-
- -
-
- -
-
- - - - - - -
-
+ +
- -
-
- -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- -
-
- -
- - -
- - - - - - - - - + +
- - - - - - - - - - - - - - - - - - -
NOPARTICULARQTYRATEAMOUNT
#{status.index + 1}#{bip.item.name} - - - - - - - - - - - -
-
- -
-
-
- -
-
- - - + - - + + - - - - + + + + + + + + + + + +
- + Patient Name: + - - - + Patient Age/Sex: +
- -
- -
- - 		- - - -
- - - -
- - 		Bill Date:2024-12-30Bill Time:11:30 PM
Bill No:BB12Department:Pharmacy
-
- - -
- + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
1Paracetamol 500mg tablet2.501025.00
2Amoxicillin 250mg capsule5.501055.00
+ + +
+ + + - - - + + - - - - - + + + - - - - - - + +
- - - - - - - - Total:80.00
- - - - - - - -
Discount:8.00
- - - - - - - - Net Total:72.00
+ + +
+ Thank you +
-
+ - +
+ +
+
+
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+
+
--> + + + + + + + + +
+ + + + + +
- - - - - - -
- - - - - -
+
+ + -
- + \ No newline at end of file From 3f3797ce7e13f0ac0badee1d5b6c0c801152bc16 Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Tue, 31 Dec 2024 14:46:39 +0530 Subject: [PATCH 15/66] Signed-off-by: Dr M H B Ariyaratne --- src/main/resources/META-INF/persistence.xml | 4 +-- .../resources/META-INF/persistence_pro.xml | 25 +++++++++++++++++++ .../sale_bill_five_five_custom_3.xhtml | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/META-INF/persistence_pro.xml diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index d0db19cf78..e250f12e48 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_DATASOURCE} + jdbc/coop false @@ -14,7 +14,7 @@ - ${JDBC_AUDIT_DATASOURCE} + jdbc/coopaudit false diff --git a/src/main/resources/META-INF/persistence_pro.xml b/src/main/resources/META-INF/persistence_pro.xml new file mode 100644 index 0000000000..d0db19cf78 --- /dev/null +++ b/src/main/resources/META-INF/persistence_pro.xml @@ -0,0 +1,25 @@ + + + + org.eclipse.persistence.jpa.PersistenceProvider + ${JDBC_DATASOURCE} + false + + + + + + + + + + + ${JDBC_AUDIT_DATASOURCE} + false + + + + + + + diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 951e44273b..bc2eba8f38 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -51,7 +51,7 @@ Patient Age/Sex: - + From 8f2a999d55e9b1d9350ed9098deb5bd090c8b59c Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Tue, 31 Dec 2024 18:47:26 +0530 Subject: [PATCH 16/66] Issue #9942 Signed-off-by: Lawan Samarasekara --- .../pharmacy/pharmacy_reprint_bill_sale.xhtml | 5 +- .../css/sale_bill_five_five_custom_3.css | 24 +++- .../sale_bill_five_five_custom_3.xhtml | 120 ++++++++++++++---- 3 files changed, 120 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml index b3233a99b8..0b16ec7821 100644 --- a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml @@ -85,7 +85,10 @@ - + + + + diff --git a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css index f1d0bb2b76..0bf0164ea0 100644 --- a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css +++ b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css @@ -3,7 +3,7 @@ font-family: "Courier New", "Liberation Mono", monospace; font-size: 12px; line-height: 1.4; - width: 12cm; + width: 11cm; height: 14cm; margin: auto; padding: 10px; @@ -68,7 +68,7 @@ .receipt-table td { text-align: left; padding: 5px; - border-bottom: 1px solid #000; +/* border-bottom: 1px solid #000;*/ } .receipt-table th { @@ -108,10 +108,24 @@ /* Print Styles */ @media print { + @page { + margin-left: 0cm!important; + margin-right: 1.5cm!important; +/* margin-top: 3cm!important;*/ + margin-bottom: 1cm!important; + } .receipt-container { + font-family: sans-serif !important; border: none; - width: 12cm; - height: 14cm; + width: 10cm!important;; + height: 14cm!important;; +/* margin-left: 0cm!important; + margin-right: 1.5cm!important; + margin-top: 3cm!important; + margin-bottom: 1cm!important;*/ + page-break-after: always!important; + page-break-before: always!important; + page-break-inside: avoid!important; } .hospital-name { @@ -120,7 +134,7 @@ .receipt-table th, .receipt-table td { - border-bottom: 1px solid #000; +/* border-bottom: 1px solid #000;*/ } .separator { diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 951e44273b..e54edcdf08 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -30,7 +30,7 @@


-
+
@@ -51,19 +51,27 @@ Patient Age/Sex: - + Bill Date: - 2024-12-30 + + + + + Bill Time: - 11:30 PM + + + + + Bill No: - BB12 + #{cc.attrs.bill.deptId} Department: Pharmacy @@ -81,24 +89,37 @@ Item Name Rate Qty - Value + Value - - 1 - Paracetamol 500mg tablet - 2.50 - 10 - 25.00 - - - 2 - Amoxicillin 250mg capsule - 5.50 - 10 - 55.00 - + + + + + #{s.index +1} + #{item.item.name} + + + + + + + + + + + + + + + + + @@ -109,22 +130,75 @@ - + - + - + + + + +
Total:80.00 + + + +
Discount:8.00 + + + +
Net Total:72.00 + + + +
No of Items: + + + +
+
+ + + +
+ + + +
+ + + + +
Thank you
+ +
+
+ + + + + +
+
+ + +
+
+
From a892494f610dc90095e943d35c0c7a5fbf9eaed4 Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Tue, 31 Dec 2024 19:13:35 +0530 Subject: [PATCH 17/66] Signed-off-by: Dr M H B Ariyaratne --- .../java/com/divudi/bean/pharmacy/PharmacySaleController.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java index 6a36dab3d8..5d31ac906c 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java @@ -2069,10 +2069,6 @@ public List createMultiplePayments(Bill bill, PaymentMethod pm) { } public void settleBillWithPay() { - Date startTime = new Date(); - Date fromDate = null; - Date toDate = null; - editingQty = null; if (sessionController.getApplicationPreference().isCheckPaymentSchemeValidation()) { From 3e4f660cae0aed31d9b5a0c3f1e29f3ef4ac714a Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Tue, 31 Dec 2024 20:55:43 +0530 Subject: [PATCH 18/66] Signed-off-by: Dr M H B Ariyaratne --- .../css/sale_bill_five_five_custom_3.css | 50 ++++++++++++------- .../sale_bill_five_five_custom_3.xhtml | 7 +-- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css index 0bf0164ea0..d71c3979c3 100644 --- a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css +++ b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css @@ -68,7 +68,7 @@ .receipt-table td { text-align: left; padding: 5px; -/* border-bottom: 1px solid #000;*/ + /* border-bottom: 1px solid #000;*/ } .receipt-table th { @@ -100,32 +100,44 @@ /* Footer */ .receipt-footer { - text-align: center; + position: sticky; + top:10cm!important; + width: 90%; font-size: 12px; - margin-top: 20px; - font-style: italic; + color: black; +} + +.billFooter{ + position: sticky; + top:11.5cm!important; + width: 90%; + font-size: 12px; + color: black; } /* Print Styles */ @media print { - @page { + /* @page { + margin-left: 0cm!important; + margin-right: 0cm!important; + margin-top: 3cm!important; + margin-bottom: 1cm!important; + page-break-after: always!important; + page-break-before: always!important; + }*/ + .receipt-container { + margin-top: 2cm!important; margin-left: 0cm!important; margin-right: 1.5cm!important; -/* margin-top: 3cm!important;*/ - margin-bottom: 1cm!important; - } - .receipt-container { font-family: sans-serif !important; border: none; - width: 10cm!important;; - height: 14cm!important;; -/* margin-left: 0cm!important; - margin-right: 1.5cm!important; - margin-top: 3cm!important; - margin-bottom: 1cm!important;*/ - page-break-after: always!important; - page-break-before: always!important; - page-break-inside: avoid!important; + width: 10cm!important; + height: 14cm!important; + /* margin-left: 0cm!important; + margin-right: 1.5cm!important; + margin-top: 3cm!important; + margin-bottom: 1cm!important;*/ + } .hospital-name { @@ -134,7 +146,7 @@ .receipt-table th, .receipt-table td { -/* border-bottom: 1px solid #000;*/ + /* border-bottom: 1px solid #000;*/ } .separator { diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index e54edcdf08..61ae011d5a 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -27,11 +27,6 @@
-
-
-
- -
@@ -457,7 +452,7 @@
--> - +
+ + + +
From f7632f7f0d19f1d40d12f373b55b80fb79a33c6c Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Tue, 31 Dec 2024 23:54:00 +0530 Subject: [PATCH 19/66] Signed-off-by: Dr M H B Ariyaratne --- src/main/webapp/resources/css/pharmacypos.css | 2 +- .../css/sale_bill_five_five_custom_3.css | 110 ++-- .../sale_bill_five_five_custom_3.xhtml | 529 +++++------------- 3 files changed, 190 insertions(+), 451 deletions(-) diff --git a/src/main/webapp/resources/css/pharmacypos.css b/src/main/webapp/resources/css/pharmacypos.css index 026da17d95..1f8af9695b 100644 --- a/src/main/webapp/resources/css/pharmacypos.css +++ b/src/main/webapp/resources/css/pharmacypos.css @@ -133,7 +133,7 @@ position: sticky; top:11.5cm!important; width: 90%; - font-size: 12px; + font-size: 11px!important; color: black; } diff --git a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css index d71c3979c3..26b6e03e71 100644 --- a/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css +++ b/src/main/webapp/resources/css/sale_bill_five_five_custom_3.css @@ -2,40 +2,42 @@ .receipt-container { font-family: "Courier New", "Liberation Mono", monospace; font-size: 12px; - line-height: 1.4; + line-height: 1.2; width: 11cm; height: 14cm; margin: auto; - padding: 10px; + padding: 2px; box-sizing: border-box; border: 1px solid #000; } /* Header */ .hospital-name { - font-family: "Courier New", "Liberation Mono", monospace !important; + font-family: sans-serif !important; text-align: center!important; - font-weight: bold!important; - font-size: 18px!important; /* Larger font for hospital name */ + font-weight: normal!important; + font-size: 16px!important; /* Larger font for hospital name */ text-transform: uppercase!important; } .hospital-details { text-align: center; - font-size: 12px; /* Smaller font for address, phone, and email */ + font-size: 12px; + font-family: sans-serif !important; + line-height: 1.2; } /* Line Separator */ .separator { border-top: 1px solid #000; - margin: 10px 0; + margin: 2px 0; } /* Patient and Bill Info Table */ .info-table { width: 100%; border-collapse: collapse; - margin-bottom: 10px; + margin-bottom: 2px; } .info-table td { @@ -44,7 +46,7 @@ } .info-table .label { - font-weight: bold; + font-weight: normal!important; text-align: left; } @@ -61,95 +63,105 @@ width: 100%; border-collapse: collapse; font-size: 12px; - margin-bottom: 10px; + margin-bottom: 2px; } .receipt-table th, .receipt-table td { text-align: left; - padding: 5px; + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; /* border-bottom: 1px solid #000;*/ } .receipt-table th { - font-weight: bold; + font-weight: normal!important; text-transform: uppercase; + font-family: sans-serif !important; + line-height: 1.2; } /* Total Section Table */ .total-table { width: 100%; border-collapse: collapse; - margin-top: 10px; - font-size: 12px; + margin-top: 2px; + font-size: 15px; + font-family: sans-serif !important; + line-height: 1.2; } .total-table td { - padding: 5px; + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; } .total-table .label { - font-weight: bold; + font-weight: normal!important; text-align: left; + font-family: sans-serif !important; + line-height: 1.2; } .total-table .value { text-align: right; - font-weight: bold; + font-weight: normal!important; + font-family: sans-serif !important; + line-height: 1.2; } /* Footer */ .receipt-footer { - position: sticky; - top:10cm!important; - width: 90%; - font-size: 12px; - color: black; -} - -.billFooter{ - position: sticky; - top:11.5cm!important; - width: 90%; + text-align: center; font-size: 12px; - color: black; + margin-top: 20px; + font-style: italic; + font-family: sans-serif !important; + line-height: 1.2; } /* Print Styles */ @media print { - /* @page { - margin-left: 0cm!important; - margin-right: 0cm!important; - margin-top: 3cm!important; - margin-bottom: 1cm!important; - page-break-after: always!important; - page-break-before: always!important; - }*/ .receipt-container { - margin-top: 2cm!important; - margin-left: 0cm!important; - margin-right: 1.5cm!important; - font-family: sans-serif !important; border: none; width: 10cm!important; - height: 14cm!important; - /* margin-left: 0cm!important; + height: 9.5cm!important; + margin-left: 0cm!important; + margin-right: 2.5cm!important; + margin-bottom: 1.0cm!important; + margin-top: 2.5cm!important; + font-family: sans-serif !important; + padding-left: 0.25cm; + /* font-family: sans-serif !important; + border: none; + width: 11cm!important; + height: 14cm!important; + margin-left: 0cm!important; margin-right: 1.5cm!important; - margin-top: 3cm!important; - margin-bottom: 1cm!important;*/ - + margin-top: 1cm!important; + margin-bottom: 0cm!important; + padding: 2px!important; + line-height: 1.2!important;*/ } .hospital-name { - font-size: 14px; + font-size: 12px; + font-family: sans-serif !important; + line-height: 1.2; } .receipt-table th, .receipt-table td { - /* border-bottom: 1px solid #000;*/ + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; } .separator { - margin: 5px 0; + margin: 2px; + font-family: sans-serif !important; + line-height: 1.2; } } diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 61ae011d5a..b4d4679c98 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -24,140 +24,145 @@ - -
- -
- - - -
- -
+
+ +
+ + + +
+ + +
- - + +
+ - - + - - + + + + + + + + + + + + + + + + + +
Patient Name: + Patient Name: Patient Age/Sex: + Patient Age/Sex:
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}Department:Pharmacy
+ + +
+ + + + - - - - - - - - - - - - + + + + + -
Bill Date: - - - - Bill Time: - - - -
Bill No:#{cc.attrs.bill.deptId}Department:PharmacyNoItem NameRateQtyValue
- - -
- - - - + + + - - - - - + + + + + + - - - - - - - - - - - - - - -
NoItem NameRateQtyValue#{s.index +1} #{item.item.name} + + + + + + + + + + + +
#{s.index +1} #{item.item.name} - - - - - - - - - - - -
- - -
- - - - - - - + + +
Total: - - - -
+ + +
+ + + + + + + + + - - + - - + - - - - -
Total: + + + +
Discount: + Discount:
Net Total: + Net Total:
No of Items: - - - -
-
- + + + +
No of Items: + + + +
+ + + + + + + +

- - - - - -
- Thank you -
- -
-
- - - - - -
-
- - -
-
- - - - - - - - -
-
- - - -
- -
-
-
- -
-
- -
-
- - -
-
+
-
-
- -
-
- -
-
- - - - - - -
-
- - -
-
- -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- -
-
- - + 		+ + + + + + +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NOPARTICULARQTYRATEAMOUNT
#{status.index + 1}#{bip.item.name} - - - - - - - - - - - -
-
-
-
-
+
-
-
- - - - - - - - - - - -
- - - - - -
- -
- -
- - 		- - - -
- - - -
- -
-
- - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - -
- - - - - - - -
-
- -
- - - - - - - - - - -
- - - - - -
- - - -
- From 290202a5c809c35728f4e9443d0232cf92b48fc4 Mon Sep 17 00:00:00 2001 From: Dr M H B Ariyaratne Date: Wed, 1 Jan 2025 00:32:19 +0530 Subject: [PATCH 20/66] Signed-off-by: Dr M H B Ariyaratne --- .../inward/pharmacy_bill_issue_bht.xhtml | 51 ++-- ...d_direct_issue_bill_five_five_custom_3.css | 167 ++++++++++++++ ...direct_issue_bill_five_five_custom_3.xhtml | 217 ++++++++++++++++++ 3 files changed, 398 insertions(+), 37 deletions(-) create mode 100644 src/main/webapp/resources/css/inward_direct_issue_bill_five_five_custom_3.css create mode 100644 src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml diff --git a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml index 131c8b1360..8e78a97a51 100644 --- a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml @@ -159,9 +159,9 @@ > -   +   @@ -226,9 +226,9 @@ -   +   @@ -372,35 +372,8 @@ - - - - - -
- - - -
+ @@ -411,16 +384,16 @@ - + - +
- +
@@ -429,6 +402,10 @@
+ + + + diff --git a/src/main/webapp/resources/css/inward_direct_issue_bill_five_five_custom_3.css b/src/main/webapp/resources/css/inward_direct_issue_bill_five_five_custom_3.css new file mode 100644 index 0000000000..26b6e03e71 --- /dev/null +++ b/src/main/webapp/resources/css/inward_direct_issue_bill_five_five_custom_3.css @@ -0,0 +1,167 @@ +/* General Container */ +.receipt-container { + font-family: "Courier New", "Liberation Mono", monospace; + font-size: 12px; + line-height: 1.2; + width: 11cm; + height: 14cm; + margin: auto; + padding: 2px; + box-sizing: border-box; + border: 1px solid #000; +} + +/* Header */ +.hospital-name { + font-family: sans-serif !important; + text-align: center!important; + font-weight: normal!important; + font-size: 16px!important; /* Larger font for hospital name */ + text-transform: uppercase!important; +} + +.hospital-details { + text-align: center; + font-size: 12px; + font-family: sans-serif !important; + line-height: 1.2; +} + +/* Line Separator */ +.separator { + border-top: 1px solid #000; + margin: 2px 0; +} + +/* Patient and Bill Info Table */ +.info-table { + width: 100%; + border-collapse: collapse; + margin-bottom: 2px; +} + +.info-table td { + font-size: 12px; + padding: 5px; +} + +.info-table .label { + font-weight: normal!important; + text-align: left; +} + +.info-table .value { + text-align: left; +} + +.info-table .spacer { + width: 10px; /* Adds space between the two columns */ +} + +/* Item Table */ +.receipt-table { + width: 100%; + border-collapse: collapse; + font-size: 12px; + margin-bottom: 2px; +} + +.receipt-table th, +.receipt-table td { + text-align: left; + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; + /* border-bottom: 1px solid #000;*/ +} + +.receipt-table th { + font-weight: normal!important; + text-transform: uppercase; + font-family: sans-serif !important; + line-height: 1.2; +} + +/* Total Section Table */ +.total-table { + width: 100%; + border-collapse: collapse; + margin-top: 2px; + font-size: 15px; + font-family: sans-serif !important; + line-height: 1.2; +} + +.total-table td { + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; +} + +.total-table .label { + font-weight: normal!important; + text-align: left; + font-family: sans-serif !important; + line-height: 1.2; +} + +.total-table .value { + text-align: right; + font-weight: normal!important; + font-family: sans-serif !important; + line-height: 1.2; +} + +/* Footer */ +.receipt-footer { + text-align: center; + font-size: 12px; + margin-top: 20px; + font-style: italic; + font-family: sans-serif !important; + line-height: 1.2; +} + +/* Print Styles */ +@media print { + .receipt-container { + border: none; + width: 10cm!important; + height: 9.5cm!important; + margin-left: 0cm!important; + margin-right: 2.5cm!important; + margin-bottom: 1.0cm!important; + margin-top: 2.5cm!important; + font-family: sans-serif !important; + padding-left: 0.25cm; + /* font-family: sans-serif !important; + border: none; + width: 11cm!important; + height: 14cm!important; + margin-left: 0cm!important; + margin-right: 1.5cm!important; + margin-top: 1cm!important; + margin-bottom: 0cm!important; + padding: 2px!important; + line-height: 1.2!important;*/ + } + + .hospital-name { + font-size: 12px; + font-family: sans-serif !important; + line-height: 1.2; + } + + .receipt-table th, + .receipt-table td { + padding: 2px; + font-family: sans-serif !important; + line-height: 1.2; + } + + .separator { + margin: 2px; + font-family: sans-serif !important; + line-height: 1.2; + } +} diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml new file mode 100644 index 0000000000..20c4c4ba48 --- /dev/null +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Patient Name: + + Patient Age/Sex: + +
BHT: + + Room No: + +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}Department:Pharmacy
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
#{s.index +1} #{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Total: + + + +
Discount: + + + +
Net Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + 		+ + + + + + + + +
+ + + +
+ + + + + + + \ No newline at end of file From dc9a100bc1d6ab4d4226773a92781461303fdc40 Mon Sep 17 00:00:00 2001 From: Buddhika Date: Wed, 1 Jan 2025 06:05:05 +0530 Subject: [PATCH 21/66] Signed-off-by: Buddhika --- src/main/java/com/divudi/entity/Patient.java | 10 +++++++++- src/main/java/com/divudi/entity/Person.java | 11 ++++++++++- src/main/resources/META-INF/persistence.xml | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/divudi/entity/Patient.java b/src/main/java/com/divudi/entity/Patient.java index d8dfa44db5..92cd609f9d 100644 --- a/src/main/java/com/divudi/entity/Patient.java +++ b/src/main/java/com/divudi/entity/Patient.java @@ -31,7 +31,7 @@ * @author buddhika */ @Entity -public class Patient implements Serializable { +public class Patient implements Serializable, RetirableEntity { static final long serialVersionUID = 1L; @Id @@ -396,34 +396,42 @@ public void setEditedAt(Date editedAt) { this.editedAt = editedAt; } + @Override public boolean isRetired() { return retired; } + @Override public void setRetired(boolean retired) { this.retired = retired; } + @Override public WebUser getRetirer() { return retirer; } + @Override public void setRetirer(WebUser retirer) { this.retirer = retirer; } + @Override public Date getRetiredAt() { return retiredAt; } + @Override public void setRetiredAt(Date retiredAt) { this.retiredAt = retiredAt; } + @Override public String getRetireComments() { return retireComments; } + @Override public void setRetireComments(String retireComments) { this.retireComments = retireComments; } diff --git a/src/main/java/com/divudi/entity/Person.java b/src/main/java/com/divudi/entity/Person.java index ce455f6ed6..8ef4200b01 100644 --- a/src/main/java/com/divudi/entity/Person.java +++ b/src/main/java/com/divudi/entity/Person.java @@ -7,6 +7,7 @@ */ package com.divudi.entity; +import com.divudi.bean.common.RetirableEntity; import com.divudi.data.Sex; import com.divudi.data.Title; import com.divudi.entity.membership.MembershipScheme; @@ -36,7 +37,7 @@ * Consultant (Health Informatics) */ @Entity -public class Person implements Serializable { +public class Person implements Serializable, RetirableEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -328,10 +329,12 @@ public void setSex(Sex sex) { this.sex = sex; } + @Override public String getRetireComments() { return retireComments; } + @Override public void setRetireComments(String retireComments) { this.retireComments = retireComments; } @@ -415,26 +418,32 @@ public void setZoneCode(String zoneCode) { this.zoneCode = zoneCode; } + @Override public boolean isRetired() { return retired; } + @Override public void setRetired(boolean retired) { this.retired = retired; } + @Override public Date getRetiredAt() { return retiredAt; } + @Override public void setRetiredAt(Date retiredAt) { this.retiredAt = retiredAt; } + @Override public WebUser getRetirer() { return retirer; } + @Override public void setRetirer(WebUser retirer) { this.retirer = retirer; } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2a3d5960d2..f4948f2543 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/coopLocal + jdbc/coopazure false From 8f1e682803c13950e53d88878761243782dd859c Mon Sep 17 00:00:00 2001 From: Buddhika Date: Wed, 1 Jan 2025 06:09:14 +0530 Subject: [PATCH 22/66] Signed-off-by: Buddhika --- src/main/java/com/divudi/entity/Patient.java | 9 +-------- src/main/resources/META-INF/persistence.xml | 5 +++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/divudi/entity/Patient.java b/src/main/java/com/divudi/entity/Patient.java index 92cd609f9d..567907cdb5 100644 --- a/src/main/java/com/divudi/entity/Patient.java +++ b/src/main/java/com/divudi/entity/Patient.java @@ -4,6 +4,7 @@ */ package com.divudi.entity; +import com.divudi.bean.common.RetirableEntity; import com.divudi.java.CommonFunctions; import java.io.Serializable; import java.util.Date; @@ -396,42 +397,34 @@ public void setEditedAt(Date editedAt) { this.editedAt = editedAt; } - @Override public boolean isRetired() { return retired; } - @Override public void setRetired(boolean retired) { this.retired = retired; } - @Override public WebUser getRetirer() { return retirer; } - @Override public void setRetirer(WebUser retirer) { this.retirer = retirer; } - @Override public Date getRetiredAt() { return retiredAt; } - @Override public void setRetiredAt(Date retiredAt) { this.retiredAt = retiredAt; } - @Override public String getRetireComments() { return retireComments; } - @Override public void setRetireComments(String retireComments) { this.retireComments = retireComments; } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index ba9a2e0809..d0db19cf78 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/hmisSL + ${JDBC_DATASOURCE} false @@ -12,8 +12,9 @@ + - jdbc/hmisaudit + ${JDBC_AUDIT_DATASOURCE} false From a4539d375cd6ae0e310fdac3dda8ec4212f969c7 Mon Sep 17 00:00:00 2001 From: imexh Date: Wed, 1 Jan 2025 13:12:18 +0530 Subject: [PATCH 23/66] added opd and cc bills --- .../java/com/divudi/bean/common/ReportsController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index e2d1e58747..a502ce3544 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -1839,6 +1839,10 @@ public void generateOPDWeeklyReport() { opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.OPD_BILL_REFUND); opdBts.add(BillTypeAtomic.INWARD_SERVICE_BATCH_BILL); opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL); @@ -1846,6 +1850,10 @@ public void generateOPDWeeklyReport() { opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); + opdBts.add(BillTypeAtomic.CC_BILL); + opdBts.add(BillTypeAtomic.CC_BILL_REFUND); + opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION); + System.out.println("bill items"); bundle.setName("Bill Items"); From ce4163c9b2a68ed62e223d3c055dc5b697943d66 Mon Sep 17 00:00:00 2001 From: imexh Date: Wed, 1 Jan 2025 13:27:23 +0530 Subject: [PATCH 24/66] added batch cancel and refund --- .../divudi/bean/common/ReportsController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index e2d1e58747..ad77e1ca7f 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -3686,16 +3686,22 @@ public void generateDiscountReport() { opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); } else if (visitType.equalsIgnoreCase("OP")) { - opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); - opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_WITH_PAYMENT); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_WITH_PAYMENT); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); - opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_REFUND); + + opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.OPD_BILL_REFUND); + + opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_CANCELLATION); + + opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); + opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER); } if (reportType.equalsIgnoreCase("detail")) { From 0903d1e909f37f5e3326d9678979542d7578b999 Mon Sep 17 00:00:00 2001 From: Pubudu-Piyankara Date: Wed, 1 Jan 2025 13:52:05 +0530 Subject: [PATCH 25/66] Signed-off-by: Pubudu-Piyankara --- .../divudi/bean/pharmacy/TransferIssueController.java | 10 +++++++--- .../bean/pharmacy/TransferReceiveController.java | 2 ++ src/main/resources/META-INF/persistence.xml | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java index 0c50dbbbbc..1c9e9b8523 100644 --- a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java +++ b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java @@ -580,9 +580,13 @@ public void settle() { } getIssuedBill().setInstitution(getSessionController().getInstitution()); - getIssuedBill().setDepartment(getIssuedBill().getFromDepartment()); -// - getIssuedBill().setToInstitution(getIssuedBill().getToDepartment().getInstitution()); + getIssuedBill().setDepartment(getSessionController().getDepartment()); + + getIssuedBill().setFromInstitution(getSessionController().getInstitution()); + getIssuedBill().setFromDepartment(getSessionController().getDepartment()); + + getIssuedBill().setToInstitution(getRequestedBill().getFromInstitution()); + getIssuedBill().setToDepartment(getRequestedBill().getFromDepartment()); getIssuedBill().setCreater(getSessionController().getLoggedUser()); getIssuedBill().setCreatedAt(Calendar.getInstance().getTime()); diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java b/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java index efb7b18e2c..51d390de96 100644 --- a/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java +++ b/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java @@ -511,6 +511,8 @@ public void saveBill() { getReceivedBill().setFromStaff(getIssuedBill().getToStaff()); getReceivedBill().setFromInstitution(getIssuedBill().getInstitution()); getReceivedBill().setFromDepartment(getIssuedBill().getDepartment()); + getReceivedBill().setToInstitution(sessionController.getInstitution()); + getReceivedBill().setToDepartment(sessionController.getDepartment()); if (getReceivedBill().getId() == null) { getBillFacade().create(getReceivedBill()); diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2571764f60..3859a00e7b 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/coopLocal + jdbc/ruhunu false @@ -13,7 +13,7 @@ - jdbc/ruhunuaudit + jdbc/ruhunuAudit false From b0bdb4b807c986606db112476e48853226607810 Mon Sep 17 00:00:00 2001 From: imexh Date: Wed, 1 Jan 2025 15:35:16 +0530 Subject: [PATCH 26/66] changed column width --- src/main/webapp/reports/financialReports/discount.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/reports/financialReports/discount.xhtml b/src/main/webapp/reports/financialReports/discount.xhtml index ddf8ebaf30..564112da16 100644 --- a/src/main/webapp/reports/financialReports/discount.xhtml +++ b/src/main/webapp/reports/financialReports/discount.xhtml @@ -347,7 +347,7 @@ - + @@ -417,7 +417,7 @@ - + Date: Wed, 1 Jan 2025 17:24:49 +0530 Subject: [PATCH 27/66] Signed-off-by: Isuru Ranaweera --- src/main/java/com/divudi/bean/common/ReportsController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index e2d1e58747..23e2f0e966 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -3354,14 +3354,14 @@ public void generateOpdAndInwardDueReport() { // opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL_PAYMENT_BY_CREDIT_COMPANY); } else if (visitType.equalsIgnoreCase("OP")) { - opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); +// opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); +// opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_WITH_PAYMENT); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); +// opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION); } From 6f5771624850b075884c85067ed6c0ff824f37c7 Mon Sep 17 00:00:00 2001 From: imexh Date: Wed, 1 Jan 2025 17:41:21 +0530 Subject: [PATCH 28/66] fixed null pointer exception bug --- .../divudi/bean/common/ReportsController.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index a502ce3544..54c36c4de6 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -1879,7 +1879,7 @@ private void groupBillItemsDaily() { final Date billItemDate = billItem.getBill().getCreatedAt(); - if (billItemDate == null) { + if (billItemDate == null || billItem.getItem() == null) { continue; } @@ -1895,7 +1895,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to7.containsKey(weekOfMonth) ? weeklyBillItemMap7to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap7to7.put(weekOfMonth, billItemMap); } else if (hourOfDay < 13) { @@ -1903,7 +1904,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to1.containsKey(weekOfMonth) ? weeklyBillItemMap7to1.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap7to1.put(weekOfMonth, billItemMap); } else { @@ -1911,7 +1913,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap1to7.containsKey(weekOfMonth) ? weeklyBillItemMap1to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap1to7.put(weekOfMonth, billItemMap); } @@ -1987,7 +1990,7 @@ private void groupBillItemsWeekly() { final Date billItemDate = billItem.getBill().getCreatedAt(); - if (billItemDate == null) { + if (billItemDate == null || billItem.getItem() == null) { continue; } @@ -2000,15 +2003,18 @@ private void groupBillItemsWeekly() { if (hourOfDay >= 19 || hourOfDay < 7) { // Between 7 PM to 7 AM billItemMap7to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0); + .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()) != null ? + billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else if (hourOfDay < 13) { // Between 7 AM to 1 PM billItemMap7to1.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0); + .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()) != null ? + billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else { // Between 1 PM to 7 PM billItemMap1to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0); + .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()) != null ? + billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } } @@ -3474,13 +3480,13 @@ private void groupBills() { Bill bill1 = row.getBill(); if (reportType != null && reportType.equalsIgnoreCase("paid")) { - if ((bill1.getNetTotal()-bill1.getPaidAmount()) != 0) { + if ((bill1.getNetTotal() - bill1.getPaidAmount()) != 0) { continue; } } if (reportType != null && reportType.equalsIgnoreCase("due")) { - if ((bill1.getNetTotal()-bill1.getPaidAmount()) == 0) { + if ((bill1.getNetTotal() - bill1.getPaidAmount()) == 0) { continue; } } @@ -3640,7 +3646,7 @@ public Double calculateSponsorShareNetTotal() { return sponsorShareNetTotal; } - + public Double calculateNetAmountSubTotalByBills(List bills) { Double netTotal = 0.0; From 4baae1a673876ae56a4d5273f1b87372061918b1 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Wed, 1 Jan 2025 18:32:29 +0530 Subject: [PATCH 29/66] Signed-off-by: Isuru Ranaweera --- src/main/java/com/divudi/bean/common/ReportsController.java | 2 +- .../reports/financialReports/opd_and_inward_due_report.xhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index bf85f04aac..025befd8c6 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -3561,7 +3561,7 @@ public Double calculateDueAmountSubTotalByBills(List bills) { Double balance = 0.0; for (Bill bill : bills) { - balance += bill.getBalance(); + balance += bill.getNetTotal() - bill.getSettledAmountBySponsor() - bill.getSettledAmountByPatient(); } return balance; diff --git a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml index 6b208c1f65..58304c248d 100644 --- a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml +++ b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml @@ -394,7 +394,7 @@ + value="#{bill.netTotal - bill.settledAmountBySponsor - bill.settledAmountByPatient}"> From 6ac76ec5acfb3f0174ee3cf5a400cf26c5659860 Mon Sep 17 00:00:00 2001 From: imexh Date: Wed, 1 Jan 2025 19:03:29 +0530 Subject: [PATCH 30/66] fixed filter bug --- .../divudi/bean/common/ReportsController.java | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index 54c36c4de6..c4726533a2 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -1834,25 +1834,31 @@ public void generateOPDWeeklyReport() { List opdBts = new ArrayList<>(); - opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); - opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); - opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.OPD_BILL_REFUND); + if (visitType == null || visitType.equalsIgnoreCase("OP")) { + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT); + opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.OPD_BILL_REFUND); + } - opdBts.add(BillTypeAtomic.INWARD_SERVICE_BATCH_BILL); - opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL); - opdBts.add(BillTypeAtomic.INWARD_SERVICE_BATCH_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL_CANCELLATION); - opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); + if (visitType == null || visitType.equalsIgnoreCase("IP")) { + opdBts.add(BillTypeAtomic.INWARD_SERVICE_BATCH_BILL); + opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL); + opdBts.add(BillTypeAtomic.INWARD_SERVICE_BATCH_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL_CANCELLATION); + opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); + } - opdBts.add(BillTypeAtomic.CC_BILL); - opdBts.add(BillTypeAtomic.CC_BILL_REFUND); - opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION); + if (visitType == null) { + opdBts.add(BillTypeAtomic.CC_BILL); + opdBts.add(BillTypeAtomic.CC_BILL_REFUND); + opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION); + } System.out.println("bill items"); @@ -2083,12 +2089,12 @@ private ReportTemplateRowBundle generateWeeklyBillItems(List bts jpql += "AND bill.billTypeAtomic in :bts "; parameters.put("bts", bts); - if (visitType != null) { - if (visitType.equalsIgnoreCase("IP") || visitType.equalsIgnoreCase("OP")) { - jpql += "AND bill.ipOpOrCc = :type "; - parameters.put("type", visitType); - } - } +// if (visitType != null) { +// if (visitType.equalsIgnoreCase("IP") || visitType.equalsIgnoreCase("OP")) { +// jpql += "AND bill.ipOpOrCc = :type "; +// parameters.put("type", visitType); +// } +// } if (getSearchKeyword().getItemName() != null && !getSearchKeyword().getItemName().trim().isEmpty()) { jpql += "AND ((bill.billPackege.name) like :itemName ) "; From 1b95dcb27b84c7423ac3a16ab00b064cacf71d06 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Wed, 1 Jan 2025 23:20:15 +0530 Subject: [PATCH 31/66] Signed-off-by: Isuru Ranaweera --- .../divudi/bean/common/ReportsController.java | 86 +++++++++++++++---- .../opd_and_inward_due_report.xhtml | 56 +++++++++++- 2 files changed, 122 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index 025befd8c6..61ab336f3b 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -337,7 +337,6 @@ public class ReportsController implements Serializable { Map>> weeklyDailyBillItemMap7to1; Map>> weeklyDailyBillItemMap1to7; - private boolean showChart; public String getDischargedStatus() { @@ -404,7 +403,6 @@ public void setSelectedDateType(String selectedDateType) { this.selectedDateType = selectedDateType; } - public Investigation getInvestigation() { return investigation; } @@ -2624,7 +2622,7 @@ public void generateDebtorBalanceReport(final boolean onlyDueBills) { } public ReportTemplateRowBundle generateDebtorBalanceReportBills(List bts, List billPaymentMethods, - boolean onlyDueBills) { + boolean onlyDueBills) { Map parameters = new HashMap<>(); String jpql = "SELECT new com.divudi.data.ReportTemplateRow(bill) " + "FROM Bill bill " @@ -3147,7 +3145,6 @@ private ReportTemplateRowBundle generateExternalLaboratoryWorkloadBillItems(List // + "LEFT JOIN PatientInvestigation pi ON pi.billItem = billItem " // + "WHERE bill.billTypeAtomic IN :bts " // + "AND bill.createdAt BETWEEN :fd AND :td "; - String jpql = "SELECT new com.divudi.data.ReportTemplateRow(billItem) " + "FROM PatientInvestigation pi " + "JOIN pi.billItem billItem " @@ -3466,13 +3463,13 @@ private void groupBills() { Bill bill1 = row.getBill(); if (reportType != null && reportType.equalsIgnoreCase("paid")) { - if ((bill1.getNetTotal()-bill1.getPaidAmount()) != 0) { + if ((bill1.getNetTotal() - bill1.getPaidAmount()) != 0) { continue; } } if (reportType != null && reportType.equalsIgnoreCase("due")) { - if ((bill1.getNetTotal()-bill1.getPaidAmount()) == 0) { + if ((bill1.getNetTotal() - bill1.getPaidAmount()) == 0) { continue; } } @@ -3632,7 +3629,7 @@ public Double calculateSponsorShareNetTotal() { return sponsorShareNetTotal; } - + public Double calculateNetAmountSubTotalByBills(List bills) { Double netTotal = 0.0; @@ -3653,7 +3650,6 @@ public Double calculateDiscountSubTotalByBills(List bills) { return discount; } - public Double calculateNetAmountNetTotal() { double netAmountNetTotal = 0.0; Map> billMap = bundle.getGroupedBillItemsByInstitution(); @@ -4010,9 +4006,7 @@ public void exportCollectionCenterBillWiseDetailReportToExcel() { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment; filename=Collection_Center_Report.xlsx"); - try (XSSFWorkbook workbook = new XSSFWorkbook(); - OutputStream out = response.getOutputStream()) { - + try (XSSFWorkbook workbook = new XSSFWorkbook(); OutputStream out = response.getOutputStream()) { XSSFSheet sheet = workbook.createSheet("Report"); int rowIndex = 0; @@ -4284,8 +4278,8 @@ public void exportDetailedWeeklyOPDReportToPDF() { } private void addWeeklyReportSection(Document document, String sectionTitle, List itemList, - List daysOfWeek, Map>> weeklyDailyBillItemMap, - int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException { + List daysOfWeek, Map>> weeklyDailyBillItemMap, + int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException { document.add(new com.itextpdf.text.Paragraph(sectionTitle, headerFont)); document.add(com.itextpdf.text.Chunk.NEWLINE); @@ -4388,8 +4382,7 @@ public void exportDetailedWeeklyOPDReportToExcel() { } } - private void populateDataRows(Sheet sheet, int rowIndex, List itemList, List daysOfWeek, Map - >> weeklyDailyBillItemMap, int week) { + private void populateDataRows(Sheet sheet, int rowIndex, List itemList, List daysOfWeek, Map>> weeklyDailyBillItemMap, int week) { for (String item : itemList) { Row dataRow = sheet.createRow(rowIndex++); int colIndex = 0; @@ -4413,8 +4406,7 @@ public void exportRouteAnalysisDetailReportToExcel() { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment; filename=Collecting_Center_Monthly_Report.xlsx"); - try (XSSFWorkbook workbook = new XSSFWorkbook(); - OutputStream out = response.getOutputStream()) { + try (XSSFWorkbook workbook = new XSSFWorkbook(); OutputStream out = response.getOutputStream()) { XSSFSheet sheet = workbook.createSheet("Monthly Report"); int rowIndex = 0; @@ -4640,4 +4632,64 @@ public void exportRouteAnalysisSummaryReportToExcel() { e.printStackTrace(); } } + + public Double calculateIpGrossAmountSubTotalByBills(List bills) { + Double billTotal = 0.0; + + for (Bill bill : bills) { + billTotal += bill.getPatientEncounter().getFinalBill().getGrantTotal(); + } + + return billTotal; + } + + public Double calculateIpDiscountSubTotalByBills(List bills) { + Double discount = 0.0; + + for (Bill bill : bills) { + discount += bill.getPatientEncounter().getFinalBill().getDiscount(); + } + + return discount; + } + + public Double calculateIpNetAmountSubTotalByBills(List bills) { + Double netTotal = 0.0; + + for (Bill bill : bills) { + netTotal += bill.getPatientEncounter().getFinalBill().getNetTotal(); + } + + return netTotal; + } + + public Double calculateIpPatientShareSubTotalByBills(List bills) { + Double settledAmountByPatient = 0.0; + + for (Bill bill : bills) { + settledAmountByPatient += bill.getPatientEncounter().getFinalBill().getSettledAmountByPatient(); + } + + return settledAmountByPatient; + } + + public Double calculateIpSponsorShareSubTotalByBills(List bills) { + Double settledAmountBySponsor = 0.0; + + for (Bill bill : bills) { + settledAmountBySponsor += bill.getPatientEncounter().getFinalBill().getSettledAmountBySponsor(); + } + + return settledAmountBySponsor; + } + + public Double calculateIpDueAmountSubTotalByBills(List bills) { + Double balance = 0.0; + + for (Bill bill : bills) { + balance += bill.getPatientEncounter().getFinalBill().getNetTotal() - bill.getPatientEncounter().getFinalBill().getSettledAmountBySponsor() - bill.getPatientEncounter().getFinalBill().getSettledAmountByPatient(); + } + + return balance; + } } diff --git a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml index 58304c248d..554c157f7f 100644 --- a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml +++ b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml @@ -576,9 +576,6 @@ - - - @@ -611,6 +608,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 15a95e7a48ec28c98a938cdfc580f582badeb694 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Thu, 2 Jan 2025 03:22:18 +0530 Subject: [PATCH 32/66] Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne --- src/main/resources/META-INF/persistence.xml | 1 - .../META-INF/persistence_for_production.xml | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2be984fec0..e1279e8abb 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,7 +2,6 @@ org.eclipse.persistence.jpa.PersistenceProvider - ${JDBC_DATASOURCE} false diff --git a/src/main/resources/META-INF/persistence_for_production.xml b/src/main/resources/META-INF/persistence_for_production.xml index 672eeeee9c..e1279e8abb 100644 --- a/src/main/resources/META-INF/persistence_for_production.xml +++ b/src/main/resources/META-INF/persistence_for_production.xml @@ -1,22 +1,24 @@ - + org.eclipse.persistence.jpa.PersistenceProvider - jdbc/ruhunu + ${JDBC_DATASOURCE} false - - - + + + + + - jdbc/ruhunuAudit + ${JDBC_AUDIT_DATASOURCE} false - - + + From 44d943fe14b3bc21b116083560311077b6524938 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Thu, 2 Jan 2025 04:45:45 +0530 Subject: [PATCH 33/66] Signed-off-by: Buddhika Ariyaratne --- .../pharmacy/PharmaceuticalBillItem.java | 57 +------------------ 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java b/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java index ec468f56aa..2130c0cc53 100644 --- a/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java +++ b/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java @@ -4,12 +4,10 @@ */ package com.divudi.entity.pharmacy; -import com.divudi.bean.common.RetirableEntity; import com.divudi.bean.common.TimeUtils; import com.divudi.entity.BillItem; import com.divudi.entity.Category; import com.divudi.entity.Institution; -import com.divudi.entity.WebUser; import java.io.Serializable; import java.util.Date; import javax.persistence.Entity; @@ -28,7 +26,7 @@ * @author Buddhika */ @Entity -public class PharmaceuticalBillItem implements Serializable, RetirableEntity { +public class PharmaceuticalBillItem implements Serializable { @OneToOne(mappedBy = "pbItem") private StockHistory stockHistory; @@ -110,19 +108,6 @@ public class PharmaceuticalBillItem implements Serializable, RetirableEntity { private boolean transThisIsStockOut; @Transient private boolean transThisIsStockIn; - - private boolean retired; - - @ManyToOne - private WebUser retirer; - - @ManyToOne - private WebUser currentHolder; - - @Temporal(javax.persistence.TemporalType.TIMESTAMP) - private Date retiredAt; - - private String retireComments; public String getSerialNo() { return serialNo; @@ -699,46 +684,6 @@ public double getRetailPackValue() { public void setRetailPackValue(double retailPackValue) { this.retailPackValue = retailPackValue; } - - public boolean isRetired() { - return retired; - } - - public void setRetired(boolean retired) { - this.retired = retired; - } - - public WebUser getRetirer() { - return retirer; - } - - public void setRetirer(WebUser retirer) { - this.retirer = retirer; - } - - public WebUser getCurrentHolder() { - return currentHolder; - } - - public void setCurrentHolder(WebUser currentHolder) { - this.currentHolder = currentHolder; - } - - public Date getRetiredAt() { - return retiredAt; - } - - public void setRetiredAt(Date retiredAt) { - this.retiredAt = retiredAt; - } - - public String getRetireComments() { - return retireComments; - } - - public void setRetireComments(String retireComments) { - this.retireComments = retireComments; - } From 559baf0b920b9ffa0235a624573e5dec0d0813dd Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 2 Jan 2025 20:42:55 +0530 Subject: [PATCH 34/66] Signed-off-by: PasinduW99 --- src/main/resources/META-INF/persistence.xml | 4 +- .../sale_bill_five_five_custom_3.xhtml | 117 ++++++++++-------- 2 files changed, 69 insertions(+), 52 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e1279e8abb..442320af04 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_DATASOURCE} + jdbc/southernlanka false @@ -13,7 +13,7 @@ - ${JDBC_AUDIT_DATASOURCE} + jdbc/southernlankaAudit false diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index b4d4679c98..2ad757d644 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -40,39 +40,45 @@ - - + - - - + + + + + + + + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} + - - + - - - + + - - - - - + + + + +
Patient Name: + Name : Patient Age/Sex: - - Age/Sex : + +
Bill Date: + Bill Date: Bill Time: + Bill Time:
Bill No:#{cc.attrs.bill.deptId}Department:PharmacyBill No:#{cc.attrs.bill.deptId}
@@ -134,7 +140,7 @@ Discount: - + @@ -152,7 +158,7 @@ No of Items: - + @@ -160,45 +166,56 @@ - +
- - - + -
- - -
- - - -
- - - - 		- + + + - - - - - - + + + + + + + + + +
+ + + + + + + + +
- + + + + + + + + +
+ + + + + + +
+ - - - \ No newline at end of file + From a66b6a19ad7839ea752f788b42cf283772965587 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 2 Jan 2025 20:44:34 +0530 Subject: [PATCH 35/66] closes #9966 Signed-off-by: PasinduW99 --- .../resources/pharmacy/sale_bill_five_five_custom_3.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 2ad757d644..4eab176d23 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -53,7 +53,7 @@ - + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} From 61645dffb1006d830d5b96ce7bc6366ca3172e81 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 2 Jan 2025 21:06:12 +0530 Subject: [PATCH 36/66] Add to Bill view for Sale1,2,3,4 Signed-off-by: PasinduW99 --- .../pharmacy_bill_retail_sale_1.xhtml | 54 +++++------------ .../pharmacy_bill_retail_sale_2.xhtml | 55 +++++------------ .../pharmacy_bill_retail_sale_3.xhtml | 59 ++++--------------- 3 files changed, 41 insertions(+), 127 deletions(-) diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml index 748e7ab0a7..d390661171 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml @@ -672,62 +672,36 @@ - - +
- - - - +

- - - - +
- -
- - - -
- - -
- - - -
+ + - -
- - - -
+ + + + + + + + + - - - - - diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml index b83bf791a2..4603990369 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml @@ -683,62 +683,35 @@ - - +
- - - - +

- - - - +
- -
- - - -
- - -
- - - -
+ + - -
- - - -
- + + + + + + + + + - - - - - diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml index 4f47f85453..625c9857ce 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml @@ -606,10 +606,6 @@ - - - - @@ -663,68 +659,39 @@ - - - - +
- - - - +

- - - - +
- -
- - - -
+ + - -
- - - -
- + + + - -
- - - -
+ + + + + - - - - - From bd5c45f98e3c19df663e518f3fbb07d9cf74933b Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Fri, 3 Jan 2025 00:33:24 +0530 Subject: [PATCH 37/66] Signed-off-by: PasinduW99 --- src/main/java/com/divudi/bean/common/SearchController.java | 2 +- src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index 8e1eebeb49..1cddbc3fad 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -4265,7 +4265,7 @@ public void createPharmacyAdjustmentBillItemTable() { sql += " order by bi.id desc"; - billItems = getBillItemFacade().findByJpql(sql, m, TemporalType.TIMESTAMP, 50); + billItems = getBillItemFacade().findByJpql(sql, m, TemporalType.TIMESTAMP); } diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml index 4603990369..8c6313fbb4 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml @@ -620,10 +620,6 @@ - - - - From 2c1b999fa223f3b814222e77107b9ea0e72edb08 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Fri, 3 Jan 2025 01:06:37 +0530 Subject: [PATCH 38/66] Signed-off-by: PasinduW99 --- .../divudi/bean/common/SearchController.java | 2 +- .../pharmacy_bill_retail_sale_1.xhtml | 54 +++----- .../pharmacy_bill_retail_sale_2.xhtml | 55 +++----- .../pharmacy_bill_retail_sale_3.xhtml | 51 +++----- .../sale_bill_five_five_custom_3.xhtml | 117 ++++++++++-------- 5 files changed, 110 insertions(+), 169 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index 8e1eebeb49..1cddbc3fad 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -4265,7 +4265,7 @@ public void createPharmacyAdjustmentBillItemTable() { sql += " order by bi.id desc"; - billItems = getBillItemFacade().findByJpql(sql, m, TemporalType.TIMESTAMP, 50); + billItems = getBillItemFacade().findByJpql(sql, m, TemporalType.TIMESTAMP); } diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml index 748e7ab0a7..697e219326 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_1.xhtml @@ -672,62 +672,36 @@ - - +
- - - - +

- - - - +
- -
- - - -
- - -
- - - -
+ + - -
- - - -
+ + + + + + + + + - - - - - diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml index b83bf791a2..4603990369 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_2.xhtml @@ -683,62 +683,35 @@ - - +
- - - - +

- - - - +
- -
- - - -
- - -
- - - -
+ + - -
- - - -
- + + + + + + + + + - - - - - diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml index 4f47f85453..2dca0457cd 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml @@ -669,58 +669,35 @@ - - +
- - - - +

- - - - +
- -
- - - -
- - -
- - - -
+ + - -
- - - -
+ + + + + + + + + - - diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index b4d4679c98..2ad757d644 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -40,39 +40,45 @@ - - + - - - + + + + + + + + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} + - - + - - - + + - - - - - + + + + +
Patient Name: + Name : Patient Age/Sex: - - Age/Sex : + +
Bill Date: + Bill Date: Bill Time: + Bill Time:
Bill No:#{cc.attrs.bill.deptId}Department:PharmacyBill No:#{cc.attrs.bill.deptId}
@@ -134,7 +140,7 @@ Discount: - + @@ -152,7 +158,7 @@ No of Items: - + @@ -160,45 +166,56 @@ - +
- - - + -
- - -
- - - -
- - - - 		- + + + - - - - - - + + + + + + + + + +
+ + + + + + + + +
- + + + + + + + + +
+ + + + + + +
+ - - - \ No newline at end of file + From 48c37b9a335db112b8ff4eda19240f1779e97c2b Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Fri, 3 Jan 2025 01:18:18 +0530 Subject: [PATCH 39/66] Signed-off-by: PasinduW99 --- .../resources/pharmacy/sale_bill_five_five_custom_3.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index 2ad757d644..f4e285fb7c 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -45,7 +45,7 @@ - + Age/Sex : From 52b08fbfa568eef3df382a1fd91016c6e327103e Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Fri, 3 Jan 2025 07:52:30 +0530 Subject: [PATCH 40/66] Signed-off-by: Buddhika Ariyaratne --- .../common/DataAdministrationController.java | 65 +++- src/main/java/com/divudi/entity/Person.java | 1 - src/main/resources/META-INF/persistence.xml | 4 +- .../webapp/dataAdmin/admin_functions.xhtml | 344 ++++++++++-------- 4 files changed, 260 insertions(+), 154 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/DataAdministrationController.java b/src/main/java/com/divudi/bean/common/DataAdministrationController.java index 2fd8d615c2..e4731c289e 100644 --- a/src/main/java/com/divudi/bean/common/DataAdministrationController.java +++ b/src/main/java/com/divudi/bean/common/DataAdministrationController.java @@ -56,6 +56,8 @@ import com.divudi.entity.BillComponent; import com.divudi.entity.BillEntry; import com.divudi.entity.BillSession; +import com.divudi.entity.Family; +import com.divudi.entity.FamilyMember; import com.divudi.entity.Patient; import com.divudi.entity.PatientDeposit; import com.divudi.entity.PatientDepositHistory; @@ -89,6 +91,8 @@ import com.divudi.facade.CashTransactionHistoryFacade; import com.divudi.facade.DrawerEntryFacade; import com.divudi.facade.DrawerFacade; +import com.divudi.facade.FamilyFacade; +import com.divudi.facade.FamilyMemberFacade; import com.divudi.facade.PatientDepositFacade; import com.divudi.facade.PatientDepositHistoryFacade; import com.divudi.facade.PatientEncounterFacade; @@ -169,6 +173,10 @@ public class DataAdministrationController implements Serializable { @EJB PatientFacade patientFacade; @EJB + FamilyMemberFacade familyMemberFacade; + @EJB + FamilyFacade familyFacade; + @EJB PatientDepositFacade patientDepositFacade; @EJB PatientEncounterFacade patientEncounterFacade; @@ -490,6 +498,61 @@ public void retireAllBillRelatedData() { System.out.println(progressMessage); } + public void retireAllMembershipData() { + progress = 0; + progressMessage = "Starting retirement process..."; + System.out.println(progressMessage); + String jpql = "Select f from Family f where f.retired=:ret"; + Map params = new HashMap(); + params.put("ret", false); + List families; + + Date retiredAt = new Date(); // Common timestamp for all retire operations + WebUser retirer = sessionController.getLoggedUser(); // The user performing the operation + String uuid = CommonFunctions.generateUuid(); + + families = familyFacade.findByJpql(jpql, params); + for (Family f : families) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + familyFacade.edit(f); + } + + jpql = "Select p from Patient p where p.retired=:ret and p.person.membershipScheme is not null"; + params = new HashMap(); + params.put("ret", false); + List patients = patientFacade.findByJpql(jpql, params); + for (Patient f : patients) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + if (f.getPerson() != null) { + f.getPerson().setRetired(true); + f.getPerson().setRetirer(retirer); + f.getPerson().setRetiredAt(retiredAt); + f.getPerson().setRetireComments(uuid); + } + patientFacade.edit(f); + } + + List familyMembers; + jpql = "Select fm from FamilyMember fm where fm.retired=:ret"; + params = new HashMap(); + params.put("ret", false); + familyMembers = patientFacade.findByJpql(jpql, params); + for (FamilyMember f : familyMembers) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + familyMemberFacade.edit(f); + } + + } + public void retireAllPatientInvestigationRelatedData() { progress = 0; progressMessage = "Starting retirement process..."; @@ -565,7 +628,7 @@ private int retireEntities(List entities, Date retiredAt, WebUser retirer retirable.setRetirer(retirer); retirable.setRetireComments(uuid); facade.edit(entity); // Use the specific facade passed as a parameter - }else{ + } else { System.out.println("Entity that does not implement retirable"); System.out.println("entity = " + entity); } diff --git a/src/main/java/com/divudi/entity/Person.java b/src/main/java/com/divudi/entity/Person.java index 8ef4200b01..049a524959 100644 --- a/src/main/java/com/divudi/entity/Person.java +++ b/src/main/java/com/divudi/entity/Person.java @@ -117,7 +117,6 @@ public class Person implements Serializable, RetirableEntity { private Item religion; @ManyToOne - @Deprecated private MembershipScheme membershipScheme; @Transient diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 442320af04..222a46b72a 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/southernlanka + jdbc/coop false @@ -13,7 +13,7 @@ - jdbc/southernlankaAudit + jdbc/ruhunuAudit false diff --git a/src/main/webapp/dataAdmin/admin_functions.xhtml b/src/main/webapp/dataAdmin/admin_functions.xhtml index eff516fade..266899d09a 100644 --- a/src/main/webapp/dataAdmin/admin_functions.xhtml +++ b/src/main/webapp/dataAdmin/admin_functions.xhtml @@ -15,175 +15,219 @@
-
+
+ +
+
+
-
+
-
+
-
- - - - - - - - - - - - - - - - - - - - - - - Retired Functions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ From ce5253ce2b79a1c2684ab766437abbea2147c663 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Fri, 3 Jan 2025 08:32:36 +0530 Subject: [PATCH 41/66] Signed-off-by: Isuru Ranaweera --- .../divudi/bean/common/ReportsController.java | 104 +++++++++++++++--- .../opd_and_inward_due_report.xhtml | 53 +++++++++ 2 files changed, 144 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index ab86392838..d04e6fa6ff 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -1899,8 +1899,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to7.containsKey(weekOfMonth) ? weeklyBillItemMap7to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? - billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null + ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap7to7.put(weekOfMonth, billItemMap); } else if (hourOfDay < 13) { @@ -1908,8 +1908,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to1.containsKey(weekOfMonth) ? weeklyBillItemMap7to1.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? - billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null + ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap7to1.put(weekOfMonth, billItemMap); } else { @@ -1917,8 +1917,8 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap1to7.containsKey(weekOfMonth) ? weeklyBillItemMap1to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? - billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null + ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); weeklyBillItemMap1to7.put(weekOfMonth, billItemMap); } @@ -2007,18 +2007,18 @@ private void groupBillItemsWeekly() { if (hourOfDay >= 19 || hourOfDay < 7) { // Between 7 PM to 7 AM billItemMap7to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()) != null ? - billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()) != null + ? billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else if (hourOfDay < 13) { // Between 7 AM to 1 PM billItemMap7to1.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()) != null ? - billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()) != null + ? billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else { // Between 1 PM to 7 PM billItemMap1to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()) != null ? - billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()) != null + ? billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } } @@ -2093,7 +2093,6 @@ private ReportTemplateRowBundle generateWeeklyBillItems(List bts // parameters.put("type", visitType); // } // } - if (getSearchKeyword().getItemName() != null && !getSearchKeyword().getItemName().trim().isEmpty()) { jpql += "AND ((bill.billPackege.name) like :itemName ) "; parameters.put("itemName", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%"); @@ -4712,4 +4711,83 @@ public Double calculateIpDueAmountSubTotalByBills(List bills) { return balance; } + + public Double calculateIpGrossAmountNetTotal() { + double grossAmountNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + grossAmountNetTotal += calculateIpGrossAmountSubTotalByBills(bills); + } + + return grossAmountNetTotal; + } + + public Double calculateIpDiscountNetTotal() { + double discountNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + discountNetTotal += calculateIpDiscountSubTotalByBills(bills); + } + + return discountNetTotal; + } + + public Double calculateIpNetAmountNetTotal() { + double netAmountNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + netAmountNetTotal += calculateIpNetAmountSubTotalByBills(bills); + } + + return netAmountNetTotal; + } + + public Double calculateIpPatientShareNetTotal() { + double patientShareNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + patientShareNetTotal += calculateIpPatientShareSubTotalByBills(bills); + } + + return patientShareNetTotal; + } + + public Double calculateIpSponsorShareNetTotal() { + double sponsorShareNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + sponsorShareNetTotal += calculateIpSponsorShareSubTotalByBills(bills); + + } + + return sponsorShareNetTotal; + } + + public Double calculateIpDueAmountNetTotal() { + double dueAmountNetTotal = 0.0; + Map> billMap = bundle.getGroupedBillItemsByInstitution(); + + for (Map.Entry> entry : billMap.entrySet()) { + List bills = entry.getValue(); + + dueAmountNetTotal += calculateIpDueAmountSubTotalByBills(bills); + } + + return dueAmountNetTotal; + } } diff --git a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml index 554c157f7f..87bef1e94e 100644 --- a/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml +++ b/src/main/webapp/reports/financialReports/opd_and_inward_due_report.xhtml @@ -662,6 +662,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fe68be39defcafcb18203119777d1b807cf00618 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Fri, 3 Jan 2025 15:02:51 +0530 Subject: [PATCH 42/66] Inword_Pharmacy_Bill_Improving Signed-off-by: PasinduW99 --- .../inward/pharmacy_bill_issue_bht.xhtml | 25 +++-- ...direct_issue_bill_five_five_custom_3.xhtml | 102 ++++++++---------- 2 files changed, 59 insertions(+), 68 deletions(-) diff --git a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml index 8e78a97a51..89e79f7f85 100644 --- a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml @@ -157,27 +157,27 @@ completeMethod="#{stockController.completeAvailableStocks}" var="i" itemLabel="#{i.itemBatch.item.name}" itemValue="#{i}" > - +   - + - + - + - + @@ -224,14 +224,14 @@ - +   - + @@ -244,20 +244,19 @@ - + - - - + - - + + + diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml index 20c4c4ba48..d9dbbe0663 100644 --- a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml @@ -40,52 +40,52 @@ - - + - - - + + - - + - - - + + - - + - - - + + - - - - - + + + + +
Patient Name: + Name: Patient Age/Sex: - + Age/Sex: +
BHT: + BHT: Room No: - + Room No: +
Bill Date: + Bill Date: Bill Time: + Bill Time:
Bill No:#{cc.attrs.bill.deptId}Department:PharmacyBill No:#{cc.attrs.bill.deptId}
@@ -165,52 +165,44 @@ No of Items: - + - - + +
- - - + + -
- - -
- - - -
- - - - 		- - - - - - - - + + +
- + + + + + + + + +
+ + + + + + +
+
- - From 008745f2e8e31d6842a37d8a0f07d70ce6d1fdd2 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Fri, 3 Jan 2025 17:05:53 +0530 Subject: [PATCH 43/66] Signed-off-by: Isuru Ranaweera --- .../collection_centre_book_wise_detail.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index 8ea33b22d3..0c8f5559b5 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -137,7 +137,7 @@ pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/> - + From 2981e41cc62fdb2f62aaa8378098bc74fa090d4f Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Fri, 3 Jan 2025 21:32:07 +0530 Subject: [PATCH 44/66] Closes #9975 Signed-off-by: Buddhika Ariyaratne --- .../bean/pharmacy/PharmacySaleController.java | 2 - src/main/resources/META-INF/persistence.xml | 4 +- .../pharmacy_cancel_bill_retail.xhtml | 10 +- .../pharmacy/pharmacy_reprint_bill_sale.xhtml | 2 +- ...bill_cancellation_five_five_custom_3.xhtml | 247 ++++++++++++++++++ .../sale_bill_five_five_custom_3_2.xhtml | 221 ++++++++++++++++ 6 files changed, 480 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml create mode 100644 src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java index 5d31ac906c..60c0b8706e 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java @@ -1449,13 +1449,11 @@ public void setBillItem(BillItem billItem) { // } @Override public PaymentMethod getPaymentMethod() { - System.out.println("get paymentMethod = " + paymentMethod); return paymentMethod; } @Override public void setPaymentMethod(PaymentMethod paymentMethod) { - System.out.println("setPaymentMethod = " + paymentMethod); this.paymentMethod = paymentMethod; } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 222a46b72a..2571764f60 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/coop + jdbc/coopLocal false @@ -13,7 +13,7 @@ - jdbc/ruhunuAudit + jdbc/ruhunuaudit false diff --git a/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml b/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml index 6503e7087c..6f8cd353ce 100644 --- a/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml @@ -5,6 +5,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core" + xmlns:phi="http://xmlns.jcp.org/jsf/composite/pharmacy" xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common" xmlns:pharmacy="http://xmlns.jcp.org/jsf/composite/pharmacy"> @@ -12,7 +13,7 @@ - +
@@ -100,6 +101,7 @@ +

sdfds

@@ -147,6 +149,12 @@ + + + + + + diff --git a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml index 0b16ec7821..5857251ca5 100644 --- a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml @@ -53,7 +53,7 @@ value="To Cancel" icon="fa fa-cancel" class="ui-button-danger" - action="pharmacy_cancel_bill_retail" + action="pharmacy_cancel_bill_retail?faces-redirect=true" disabled="#{pharmacyBillSearch.bill.cancelled}" rendered="#{webUserController.hasPrivilege('PharmacySaleCancel')}"> diff --git a/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml new file mode 100644 index 0000000000..1cc04f930d --- /dev/null +++ b/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name : + + Age/Sex : + +
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.billedBill.deptId}
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
#{s.index +1} #{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Total: + + + +
Discount: + + + +
Net Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + + + + +
+ + + + + + +
+ + +
+ + + + + diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml new file mode 100644 index 0000000000..4eab176d23 --- /dev/null +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} + + + + + + + + + + + + + + + + +
Name : + + Age/Sex : + +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
#{s.index +1} #{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Total: + + + +
Discount: + + + +
Net Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + + + + +
+ + + + + + +
+ + +
+ + + + + From e9bce3c30506f8652d1e73d892517a862be3171d Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sat, 4 Jan 2025 04:58:24 +0530 Subject: [PATCH 45/66] Signed-off-by: Buddhika Ariyaratne --- src/main/webapp/inward/inward_admission.xhtml | 8 ++++--- .../pharmacy_cancel_bill_retail.xhtml | 22 +++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/inward/inward_admission.xhtml b/src/main/webapp/inward/inward_admission.xhtml index 76d2c225b8..28e0b1eca3 100644 --- a/src/main/webapp/inward/inward_admission.xhtml +++ b/src/main/webapp/inward/inward_admission.xhtml @@ -130,7 +130,7 @@ id="refCon" required="true" requiredMessage="Please select referring consultant" completeMethod="#{consultantController.completeConsultant}" - var="mysp" itemLabel="#{mysp.person.nameWithTitle}" itemValue="#{mysp}" + var="mysp" itemLabel="#{mysp.person.name}" itemValue="#{mysp}" styleClass="form-control w-100" class="w-100" placeholder="Referring Consultant" inputStyleClass="w-100"> @@ -141,7 +141,9 @@ forceSelection="true" id="scStaff" placeholder="OPD Doctor" value="#{admissionController.current.opdDoctor}" completeMethod="#{doctorController.completeDoctor}" - var="mys" itemLabel="#{mys.person.nameWithTitle}" itemValue="#{mys}" + var="mys" + itemLabel="#{mys.person.name}" + itemValue="#{mys}" styleClass="form-control w-100" class="w-100" inputStyleClass="w-100" @@ -152,7 +154,7 @@ -

sdfds

- + - + - + From f885783442c7c3c232d709e6f09da9e67a22bbc7 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sat, 4 Jan 2025 05:01:23 +0530 Subject: [PATCH 46/66] Signed-off-by: Buddhika Ariyaratne --- src/main/resources/META-INF/persistence.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2571764f60..e1279e8abb 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/coopLocal + ${JDBC_DATASOURCE} false @@ -13,7 +13,7 @@ - jdbc/ruhunuaudit + ${JDBC_AUDIT_DATASOURCE} false From 50871a09bd1b00c68d5090793969f28d3ab8a7a7 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sat, 4 Jan 2025 17:13:08 +0530 Subject: [PATCH 47/66] Signed-off-by: Buddhika Ariyaratne --- src/main/resources/META-INF/persistence.xml | 4 +- .../inward/pharmacy_bill_issue_bht.xhtml | 1 - ...direct_issue_bill_five_five_custom_3.xhtml | 43 +++++++++++-------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e1279e8abb..2571764f60 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_DATASOURCE} + jdbc/coopLocal false @@ -13,7 +13,7 @@ - ${JDBC_AUDIT_DATASOURCE} + jdbc/ruhunuaudit false diff --git a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml index 8e78a97a51..ccf91abbb0 100644 --- a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml @@ -243,7 +243,6 @@ - diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml index 20c4c4ba48..3442cd392e 100644 --- a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml @@ -99,6 +99,7 @@ No Item Name Rate + Service Charge Qty Value @@ -114,13 +115,19 @@ + + + + + + - + @@ -143,25 +150,23 @@ - - - Discount: - - - - - - - - Net Total: - - - - - - + + Service Fee + + + + + + + + Net Total: + + + + + + - No of Items: From 1408c940ed67cbc6ff4aebc5b70ec4dc4d3bd0fd Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sat, 4 Jan 2025 18:03:52 +0530 Subject: [PATCH 48/66] Closes #9981 Signed-off-by: Buddhika Ariyaratne --- src/main/resources/META-INF/persistence.xml | 4 +- .../pharmacy_reprint_bill_sale_bht.xhtml | 9 +++- ...direct_issue_bill_five_five_custom_3.xhtml | 42 ++++++++++++------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2571764f60..e1279e8abb 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/coopLocal + ${JDBC_DATASOURCE} false @@ -13,7 +13,7 @@ - jdbc/ruhunuaudit + ${JDBC_AUDIT_DATASOURCE} false diff --git a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml index 45b0103621..3f341d4f82 100644 --- a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml @@ -199,7 +199,7 @@
- + @@ -208,7 +208,12 @@ - + + + + + +
diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml index 3442cd392e..8220838103 100644 --- a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml @@ -97,31 +97,44 @@ No - Item Name - Rate - Service Charge - Qty - Value + Item Name + Qty + + + + + Rate + Item Value + Service Fee + Total Value - - #{s.index +1} - #{item.item.name} - + #{s.index +1} + #{item.item.name} + + + + + + + + + + - - - + + + - + @@ -131,6 +144,7 @@ + @@ -151,7 +165,7 @@ - Service Fee + Service Fee: From 9eab3067d2fd24bc022b523c169e644bfaf69a73 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sat, 4 Jan 2025 18:25:52 +0530 Subject: [PATCH 49/66] Signed-off-by: Buddhika Ariyaratne --- ...direct_issue_bill_five_five_custom_3.xhtml | 47 ++----------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml index 8220838103..9c4f945dda 100644 --- a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml @@ -97,16 +97,10 @@ No - Item Name + Item Qty - - - - Rate - Item Value - Service Fee - Total Value + Value @@ -119,23 +113,8 @@ - - - - - - - - - - - - - - - - + @@ -144,7 +123,6 @@ - @@ -157,31 +135,12 @@ - - - - - - - - - - - + -
Total: - - - -
Service Fee: - - - -
Net Total:
No of Items: From cbebdc69138e418f180571534a011e87c39a118b Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sun, 5 Jan 2025 04:07:04 +0530 Subject: [PATCH 50/66] Signed-off-by: Buddhika Ariyaratne --- .../pharmacy/BhtIssueReturnController.java | 9 ++ .../bean/pharmacy/PharmacyBillSearch.java | 8 ++ src/main/resources/META-INF/persistence.xml | 4 +- .../pharmacy_cancel_bill_retail_bht.xhtml | 33 +++++--- .../pharmacy_reprint_bill_sale_bht.xhtml | 8 +- .../ezcomp/common/admission_details.xhtml | 2 +- .../ezcomp/common/patient_details.xhtml | 2 +- .../ezcomp/common/patient_details_view.xhtml | 83 +++++++++++++++++++ 8 files changed, 131 insertions(+), 18 deletions(-) create mode 100644 src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml diff --git a/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java b/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java index 704140de0f..2c9587100d 100644 --- a/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java +++ b/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java @@ -66,6 +66,15 @@ public class BhtIssueReturnController implements Serializable { @EJB private BillItemFacade billItemFacade; + + public String navigateToReturnPharmacyDirectIssueToInpatients(){ + if(bill==null){ + JsfUtil.addErrorMessage("No Bill Selected"); + return null; + } + return "/inward/pharmacy_bill_return_bht_issue?faces-redirect=true"; + } + public Bill getBill() { return bill; } diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java index d40b96869f..104a95d0fe 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java @@ -155,6 +155,14 @@ public class PharmacyBillSearch implements Serializable { @Inject PharmacyRequestForBhtController pharmacyRequestForBhtController; + public String navigateToCancelPharmacyDirectIssueToInpatients(){ + if(bill==null){ + JsfUtil.addErrorMessage("No Bill Selected"); + return null; + } + return "/inward/pharmacy_cancel_bill_retail_bht?faces-redirect=true"; + } + public String navigatePharmacyReprintPo() { return "pharmacy_reprint_po?faces-redirect=true"; } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e1279e8abb..2571764f60 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_DATASOURCE} + jdbc/coopLocal false @@ -13,7 +13,7 @@ - ${JDBC_AUDIT_DATASOURCE} + jdbc/ruhunuaudit false diff --git a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml index 03062f5fbd..d31bace2cf 100644 --- a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml @@ -5,6 +5,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core" + xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common" xmlns:pharmacy="http://xmlns.jcp.org/jsf/composite/pharmacy/inward" xmlns:phi="http://xmlns.jcp.org/jsf/composite/pharmacy"> @@ -13,11 +14,11 @@ - - + +
-
+
- + @@ -39,13 +40,26 @@ - - - - + + + + + + + + + + + + + + + - + + +
@@ -95,7 +109,6 @@ - diff --git a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml index 3f341d4f82..2542bf92d3 100644 --- a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml @@ -32,13 +32,13 @@ value="To Cancel" class="ui-button-danger" icon="fa fa-ban" - action="pharmacy_cancel_bill_retail_bht" + action="#{pharmacyBillSearch.navigateToCancelPharmacyDirectIssueToInpatients}" disabled="#{pharmacyBillSearch.bill.cancelled}" >
-
+
@@ -177,7 +177,7 @@
-
+
diff --git a/src/main/webapp/resources/ezcomp/common/admission_details.xhtml b/src/main/webapp/resources/ezcomp/common/admission_details.xhtml index a5149084eb..cb67f008f8 100644 --- a/src/main/webapp/resources/ezcomp/common/admission_details.xhtml +++ b/src/main/webapp/resources/ezcomp/common/admission_details.xhtml @@ -16,7 +16,7 @@ - + diff --git a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml index 7849170fd0..0450b6f993 100644 --- a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml +++ b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml @@ -18,7 +18,7 @@ - + diff --git a/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml new file mode 100644 index 0000000000..89d4d99b52 --- /dev/null +++ b/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1eaaf81830d469a1e15e11fd9e55c9e6f7a5eea3 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Sun, 5 Jan 2025 04:50:22 +0530 Subject: [PATCH 51/66] Closes #9984 Signed-off-by: Buddhika Ariyaratne --- .../pharmacy_cancel_bill_retail_bht.xhtml | 37 ++- src/main/webapp/resources/css/ohmis.css | 47 ++++ ...cancellation_bill_five_five_custom_3.xhtml | 231 ++++++++++++++++++ .../webapp/resources/template/template.xhtml | 20 +- 4 files changed, 319 insertions(+), 16 deletions(-) create mode 100644 src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml diff --git a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml index d31bace2cf..4909ed20e8 100644 --- a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml +++ b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml @@ -9,6 +9,10 @@ xmlns:pharmacy="http://xmlns.jcp.org/jsf/composite/pharmacy/inward" xmlns:phi="http://xmlns.jcp.org/jsf/composite/pharmacy"> + + + + @@ -64,9 +68,13 @@
- - - + + + No #{rowIndex+1} @@ -74,9 +82,22 @@ Item #{bip.item.name} - + + Qty + + + + + Rate + + + + + Value - #{bip.netValue} + + + @@ -113,7 +134,11 @@ - + + + + + diff --git a/src/main/webapp/resources/css/ohmis.css b/src/main/webapp/resources/css/ohmis.css index 706a2704fb..01818370f4 100644 --- a/src/main/webapp/resources/css/ohmis.css +++ b/src/main/webapp/resources/css/ohmis.css @@ -546,3 +546,50 @@ th.align-right-header .ui-column-title { background-color: #00a88f !important; border-color: #007f6b !important; } + +/* Ensure the condensed table class applies specifically to this DataTable */ +.condensed-table.ui-datatable { + margin: 0 !important; + padding: 0 !important; + font-size: 1rem !important; /* Adjust font size */ + line-height: 1 !important; + border-collapse: collapse !important; +} + +/* Remove spacing and padding in headers and footers */ +.condensed-table.ui-datatable .ui-datatable-header, +.condensed-table.ui-datatable .ui-datatable-footer { + padding: 0 !important; + margin: 0 !important; +} + +/* Remove padding and spacing for table cells */ +.condensed-table.ui-datatable .ui-datatable-thead > tr > th, +.condensed-table.ui-datatable .ui-datatable-tbody > tr > td { + padding: 0 !important; + margin: 0 !important; + text-align: left !important; + border: none !important; +} + +/* Remove padding from the wrapper */ +.condensed-table.ui-datatable .ui-datatable-tablewrapper { + padding: 0 !important; + margin: 0 !important; +} + +/* Specific adjustments for labels inside cells */ +.condensed-table.ui-datatable .ui-datatable-tbody > tr > td label { + margin: 0 !important; + padding: 0 !important; + font-size: inherit !important; + line-height: inherit !important; +} + +/* Ensure the table itself is tightly packed */ +.condensed-table.ui-datatable table { + border-collapse: collapse !important; + border-spacing: 0 !important; + width: 100% !important; +} + diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml new file mode 100644 index 0000000000..8a7befab53 --- /dev/null +++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Patient Name: + + Patient Age/Sex: + +
BHT: + + Room No: + +
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.billedBill.deptId}Department:Pharmacy
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}Department:Pharmacy
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + +
NoItemQtyRateValue
#{s.index +1}#{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + 		+ + + + + + + + +
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/resources/template/template.xhtml b/src/main/webapp/resources/template/template.xhtml index 290726690d..5d0a47e65a 100644 --- a/src/main/webapp/resources/template/template.xhtml +++ b/src/main/webapp/resources/template/template.xhtml @@ -24,7 +24,7 @@ - + @@ -41,17 +41,17 @@ - + From c4fe526a124e4a13f42add9775a74b8838981018 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Sun, 5 Jan 2025 23:57:05 +0530 Subject: [PATCH 52/66] Signed-off-by: Isuru Ranaweera --- .../collection_centre_book_wise_detail.xhtml | 227 ++++++++++-------- 1 file changed, 129 insertions(+), 98 deletions(-) diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index 0c8f5559b5..da5f65d0f5 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -1,54 +1,54 @@ + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - - - - + + + + + - - - - - - - + + + + + + - + - + - - - - - - + + + + + - + - - - - - - + + + + + - #{vt.code} - #{vt.name} - + #{vt.code} + #{vt.name} + - + - - - - - - + + + + + + -
-
- - +
+
+ + - - - - + + - - - + + - - + + +
-
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + From 9c0e62bbf56e5362fd024687e2a387593f125640 Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Mon, 6 Jan 2025 04:01:09 +0530 Subject: [PATCH 53/66] Closes #9987 Signed-off-by: Buddhika Ariyaratne --- .../bean/inward/AdmissionController.java | 10 +- src/main/webapp/inward/inward_admission.xhtml | 166 +++++++++--------- 2 files changed, 96 insertions(+), 80 deletions(-) diff --git a/src/main/java/com/divudi/bean/inward/AdmissionController.java b/src/main/java/com/divudi/bean/inward/AdmissionController.java index 200957a543..05334f4ac7 100644 --- a/src/main/java/com/divudi/bean/inward/AdmissionController.java +++ b/src/main/java/com/divudi/bean/inward/AdmissionController.java @@ -1169,7 +1169,15 @@ public void saveSelected() { savePatient(); savePatientAllergies(); saveGuardian(); - bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType()); + boolean bhtCanBeEdited = configOptionApplicationController.getBooleanValueByKey("BHT Number can be edited at the time of admission"); + if(bhtText==null||bhtText.trim().equals("")){ + bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType()); + }else{ + if(!bhtCanBeEdited){ + bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType()); + } + } +// bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType()); getCurrent().setBhtNo(getBhtText()); // getCurrent().setBhtNo(bhtText); diff --git a/src/main/webapp/inward/inward_admission.xhtml b/src/main/webapp/inward/inward_admission.xhtml index 28e0b1eca3..434cce8477 100644 --- a/src/main/webapp/inward/inward_admission.xhtml +++ b/src/main/webapp/inward/inward_admission.xhtml @@ -46,6 +46,7 @@ icon="fa fa-user" > +
@@ -54,53 +55,60 @@
-
- - - - - - - - - - -
- -
- -
-
- - - - - - - - - - - - - - - +
+ + + + + + +
+
+ + +
+
+ + +
+
+ +
-
+
@@ -242,7 +250,7 @@ - +
- - -
-
- - - - - - - - - - - - - - - - - -
-
- - - - + + +
+
+ + + + + + + + + + + + + + + + + +
+
+ + + +
From 3a6643ec28ae3eb7959abfd64d93ba4f3f92769e Mon Sep 17 00:00:00 2001 From: Buddhika Ariyaratne Date: Mon, 6 Jan 2025 04:50:43 +0530 Subject: [PATCH 54/66] Closes #3851 Signed-off-by: Buddhika Ariyaratne --- .../bean/common/UserPrivilageController.java | 12 +++++-- src/main/java/com/divudi/data/Privileges.java | 12 ++++++- src/main/webapp/resources/ezcomp/menu.xhtml | 32 ++++++++++++++++--- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/UserPrivilageController.java b/src/main/java/com/divudi/bean/common/UserPrivilageController.java index 8d93a0e97f..2d51984195 100644 --- a/src/main/java/com/divudi/bean/common/UserPrivilageController.java +++ b/src/main/java/com/divudi/bean/common/UserPrivilageController.java @@ -502,15 +502,21 @@ private TreeNode createPrivilegeHolderTreeNodes() { new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewStatistics, "Courier View Statistics"), courierNode); new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewBillReports, "Courier View Bill Reports"), courierNode); new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewPaymentReports, "Courier View Payment Reports"), courierNode); + + // User Menu + TreeNode userNode = new DefaultTreeNode(new PrivilegeHolder(null, "User"), allNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.UserMenu, "User Menu"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyPassword, "Change User Password"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyTheme, "Change User Theme"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change User Preferances"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyApiKeys, "Change API Keys"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MyFinanacialTransactionManager, "User Financial Transaction Manager"), userNode); // Search Privileges TreeNode searchRootNode = new DefaultTreeNode(new PrivilegeHolder(null, "Search"), allNode); new DefaultTreeNode(new PrivilegeHolder(Privileges.Search, "Search Menu"), searchRootNode); new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchGrand, "Grand Search"), searchRootNode); - // User Privileges - TreeNode userNode = new DefaultTreeNode(new PrivilegeHolder(null, "User"), allNode); - new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change Theme"), userNode); // Cash Transaction Privileges TreeNode cashTransactionNode = new DefaultTreeNode(new PrivilegeHolder(null, "Cash Transaction"), allNode); diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java index c2ea645b50..4090b0755c 100644 --- a/src/main/java/com/divudi/data/Privileges.java +++ b/src/main/java/com/divudi/data/Privileges.java @@ -560,6 +560,16 @@ public enum Privileges { ChangeCreditLimitInCC("Change Credit Limit in Collecting Centre"), ChangeCollectingCentre("Change Collecting Centre"), // + + // + UserMenu("User Menu"), + ChangeMyPassword("Change My Password"), + ChangeMyTheme("Change My Theme"), + ChangePreferece("Change My Preference"), + ChangeMyApiKeys("Change My Api Keys"), + MyFinanacialTransactionManager("My Finanacial Transaction Manager"), + // + // SearchGrand("Search Grand"), @@ -575,7 +585,7 @@ public enum Privileges { Developers("Developers"), // Administration SearchAll("Search All"), - ChangePreferece("Change Preference"), + SendBulkSMS("Send Bulk SMS"), SuperAdmin("Supper Admin"), EditData("Edit Data"), diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml index a16cdd60a4..2bb23baaaa 100644 --- a/src/main/webapp/resources/ezcomp/menu.xhtml +++ b/src/main/webapp/resources/ezcomp/menu.xhtml @@ -1505,12 +1505,36 @@ - - - - + + + + + + Date: Mon, 6 Jan 2025 05:00:11 +0530 Subject: [PATCH 55/66] Closes #9990 Signed-off-by: Buddhika Ariyaratne --- .../divudi/bean/common/SearchController.java | 11 +- src/main/webapp/cashier/index.xhtml | 8 + .../my_department_all_cashier_summary.xhtml | 367 ++++++++++++++++++ 3 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/cashier/my_department_all_cashier_summary.xhtml diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index 1cddbc3fad..9beb3fb9b0 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -368,6 +368,14 @@ public class SearchController implements Serializable { // // + public String navigateToMyDepartmentAllCashierSummary() { + department = sessionController.getDepartment(); + institution = sessionController.getInstitution(); + site = sessionController.getDepartment().getSite(); + webUser=null; + return "/cashier/my_department_all_cashier_summary?faces-redirect=true"; + } + public String navigateToUserDrawerDashboard() { Drawer d = drawerController.getUsersDrawer(drawer.getDrawerUser()); drawerController.setCurrent(d); @@ -17385,7 +17393,7 @@ public PharmacyAdjustmentRow(Item itm, double purchaseRate, double saleRate, dou } // - // + // public Item getItm() { return itm; } @@ -18146,5 +18154,4 @@ public void prepareDataBillsAndBillItemsDownload() { } // - } diff --git a/src/main/webapp/cashier/index.xhtml b/src/main/webapp/cashier/index.xhtml index b6b7ed86b5..ccc7a4b601 100644 --- a/src/main/webapp/cashier/index.xhtml +++ b/src/main/webapp/cashier/index.xhtml @@ -299,6 +299,14 @@ ajax="false" action="#{financialTransactionController.navigateToMyCashierSummary()}" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From be15f247050c66d5e5a789e6e2b412e5506b6765 Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 11:43:28 +0530 Subject: [PATCH 56/66] Signed-off-by: Sandith Pivithuru fixed --- .../bean/report/PharmacyReportController.java | 8 +++- src/main/resources/META-INF/persistence.xml | 4 +- .../inventoryReports/expiry_item.xhtml | 48 ++++++++++++++----- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/divudi/bean/report/PharmacyReportController.java b/src/main/java/com/divudi/bean/report/PharmacyReportController.java index 98f48e003a..0ea1d72dd6 100644 --- a/src/main/java/com/divudi/bean/report/PharmacyReportController.java +++ b/src/main/java/com/divudi/bean/report/PharmacyReportController.java @@ -2191,12 +2191,18 @@ public void processExpiryItemReport() { if (amp != null) { item = amp; System.out.println("item = " + item); - jpql += "and s.item=:itm "; + jpql += "and s.itemBatch.item=:itm "; m.put("itm", item); } jpql += " order by s.id "; stocks = stockFacade.findByJpql(jpql, m, TemporalType.TIMESTAMP); + stockPurchaseValue = 0.0; + stockSaleValue = 0.0; + for (Stock ts : stocks) { + stockPurchaseValue = stockPurchaseValue + (ts.getItemBatch().getPurcahseRate() * ts.getStock()); + stockSaleValue = stockSaleValue + (ts.getItemBatch().getRetailsaleRate() * ts.getStock()); + } } public long calculateDaysRemaining(Date dateOfExpire) { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 2571764f60..3859a00e7b 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/coopLocal + jdbc/ruhunu false @@ -13,7 +13,7 @@ - jdbc/ruhunuaudit + jdbc/ruhunuAudit false diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index 0ab770f3f3..cd7e2b5889 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -297,24 +297,15 @@ - + - - - - - - - - - - - + + @@ -328,6 +319,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6c3823dd2e20c66fbe3d2a78fb681f61a2fef3f7 Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 12:22:42 +0530 Subject: [PATCH 57/66] Signed-off-by: Sandith Pivithuru --- src/main/resources/META-INF/persistence.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 3859a00e7b..e1279e8abb 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/ruhunu + ${JDBC_DATASOURCE} false @@ -13,7 +13,7 @@ - jdbc/ruhunuAudit + ${JDBC_AUDIT_DATASOURCE} false From c1a48faa264c3209868c9af4d00dc2a538525101 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Mon, 6 Jan 2025 12:27:08 +0530 Subject: [PATCH 58/66] cc book wise bill total and listing data fixed Signed-off-by: Isuru Ranaweera --- .../com/divudi/bean/common/ReportsController.java | 2 +- .../collection_centre_book_wise_detail.xhtml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index d04e6fa6ff..a0b0ba6bfa 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -2823,7 +2823,7 @@ public void generateCollectionCenterBookWiseDetailReport() { opdBts.add(BillTypeAtomic.CC_BILL); opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.CC_BILL_REFUND); - opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL); +// opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL); bundle.setName("Bills"); bundle.setBundleType("billList"); diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index da5f65d0f5..271f8b5168 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -112,13 +112,7 @@ class="w-100 m-2" value="#{reportsController.bundle.reportTemplateRows}" var="c" - paginator="true" - paginatorAlwaysVisible="false" - paginatorPosition="bottom" - rows="10" - rowIndexVar="b" - paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" - rowsPerPageTemplate="5,10,20"> + rowIndexVar="b"> + + + + + From e5f75608f5315e0304934b0340ddec44835567ee Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 12:35:29 +0530 Subject: [PATCH 59/66] Signed-off-by: Sandith Pivithuru --- src/main/webapp/reports/inventoryReports/expiry_item.xhtml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index cd7e2b5889..db02740359 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -107,7 +107,6 @@ - From 22bab5e49f38ac9e48b9e8679d402031cb73e44c Mon Sep 17 00:00:00 2001 From: "Dr. M H B Ariyaratne" Date: Mon, 6 Jan 2025 15:09:14 +0530 Subject: [PATCH 60/66] Pharmacy retail bill cancellation is not working #9975 (#9979) * Signed-off-by: Buddhika * Signed-off-by: SandithP2001 * fix:disbursement recieve issues fixed. * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * fix: add validation for cant issue more than requested medicine quantity. Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: Pubudu-Piyankara * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 * Signed-off-by: SandithP2001 closes #9931 * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Issue #9942 Signed-off-by: Lawan Samarasekara * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Pubudu-Piyankara * Signed-off-by: Pubudu-Piyankara closed * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Buddhika * Signed-off-by: Buddhika * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne * Signed-off-by: Buddhika Ariyaratne * Signed-off-by: PasinduW99 * closes #9966 Signed-off-by: PasinduW99 * Add to Bill view for Sale1,2,3,4 Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: Buddhika Ariyaratne * Closes #9975 Signed-off-by: Buddhika Ariyaratne * Signed-off-by: Buddhika Ariyaratne * Signed-off-by: Buddhika Ariyaratne * Pharmacy retail sale bill error (#9944) * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Issue #9942 Signed-off-by: Lawan Samarasekara * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne --------- Signed-off-by: Dr M H B Ariyaratne Signed-off-by: Lawan Samarasekara Co-authored-by: Geeth Sandaru Madhushan Co-authored-by: Lawan Samarasekara * 9836 pharmacy disbursement and suplier isses (#9946) * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Issue#9949 disbursement issue receive bill improvements (#9950) * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: Pubudu-Piyankara * Signed-off-by: Chinthaka Prasad * Signed-off-by: Pubudu-Piyankara --------- Co-authored-by: Chinthaka Prasad Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Issue#9822 discount report (#9954) * added batch cancel and refund * changed column width --------- Co-authored-by: imexh * OPD Weekly Report #9886 (#9955) * added opd and cc bills * fixed null pointer exception bug * fixed filter bug --------- Co-authored-by: imexh * #9960 pharmacy retail sale not available even after starting a new shift (#9961) * Signed-off-by: Buddhika * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: Pubudu-Piyankara * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Issue #9942 Signed-off-by: Lawan Samarasekara * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Buddhika * Signed-off-by: Buddhika * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne * Signed-off-by: Buddhika Ariyaratne --------- Signed-off-by: Buddhika Signed-off-by: IsuruUdaraRanaweera Signed-off-by: Dr M H B Ariyaratne Signed-off-by: Lawan Samarasekara Signed-off-by: Isuru Ranaweera Signed-off-by: Buddhika Ariyaratne Co-authored-by: IsuruUdaraRanaweera Co-authored-by: Chinthaka Prasad Co-authored-by: Pubudu-Piyankara Co-authored-by: Geeth Sandaru Madhushan Co-authored-by: Lawan Samarasekara Co-authored-by: imexh Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Issue#9834/opd and inward due report (#9971) * Signed-off-by: Buddhika * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Signed-off-by: Pubudu-Piyankara * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Issue #9942 Signed-off-by: Lawan Samarasekara * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Buddhika * Signed-off-by: Buddhika * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara * Signed-off-by: Chinthaka Prasad * Signed-off-by: Chinthaka Prasad * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne * Signed-off-by: Buddhika Ariyaratne * Signed-off-by: PasinduW99 * closes #9966 Signed-off-by: PasinduW99 * Add to Bill view for Sale1,2,3,4 Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: PasinduW99 * Signed-off-by: Isuru Ranaweera * Signed-off-by: Isuru Ranaweera --------- Signed-off-by: Buddhika Signed-off-by: IsuruUdaraRanaweera Signed-off-by: Dr M H B Ariyaratne Signed-off-by: Lawan Samarasekara Signed-off-by: Isuru Ranaweera Signed-off-by: Buddhika Ariyaratne Signed-off-by: PasinduW99 Co-authored-by: Buddhika Co-authored-by: Chinthaka Prasad Co-authored-by: Pubudu-Piyankara Co-authored-by: Geeth Sandaru Madhushan Co-authored-by: Lawan Samarasekara Co-authored-by: imexh Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: PasinduW99 Co-authored-by: Pasindu Wathsara <113449846+PasinduW99@users.noreply.github.com> --------- Signed-off-by: Buddhika Signed-off-by: Chinthaka Prasad Signed-off-by: IsuruUdaraRanaweera Signed-off-by: Dr M H B Ariyaratne Signed-off-by: Lawan Samarasekara Signed-off-by: Isuru Ranaweera Signed-off-by: Buddhika Ariyaratne Signed-off-by: PasinduW99 Co-authored-by: Chinthaka Prasad Co-authored-by: IsuruUdaraRanaweera Co-authored-by: SandithP2001 Co-authored-by: Pubudu-Piyankara Co-authored-by: Geeth Sandaru Madhushan Co-authored-by: Lawan Samarasekara Co-authored-by: imexh Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Irani Madushika <153506668+Irani96@users.noreply.github.com> Co-authored-by: Sandith Pivithuru <114053279+SandithP2001@users.noreply.github.com> Co-authored-by: PasinduW99 Co-authored-by: Pubudu Piyankara <139697238+Pubudu-Piyankara@users.noreply.github.com> Co-authored-by: Imesh Ranawella Co-authored-by: Isuru Ranaweera <152675215+IsuruUdaraRanaweera@users.noreply.github.com> Co-authored-by: Pasindu Wathsara <113449846+PasinduW99@users.noreply.github.com> --- .../common/DataAdministrationController.java | 65 +++- .../divudi/bean/common/ReportsController.java | 35 +- .../bean/pharmacy/PharmacyController.java | 10 +- .../bean/pharmacy/PharmacySaleController.java | 2 - src/main/java/com/divudi/entity/Person.java | 1 - .../webapp/dataAdmin/admin_functions.xhtml | 344 ++++++++++-------- src/main/webapp/inward/inward_admission.xhtml | 8 +- .../pharmacy_bill_retail_sale_1.xhtml | 4 +- .../pharmacy_bill_retail_sale_3.xhtml | 11 +- .../pharmacy_cancel_bill_retail.xhtml | 30 +- .../pharmacy/pharmacy_reprint_bill_sale.xhtml | 2 +- ...bill_cancellation_five_five_custom_3.xhtml | 247 +++++++++++++ .../sale_bill_five_five_custom_3.xhtml | 128 ++++--- .../sale_bill_five_five_custom_3_2.xhtml | 221 +++++++++++ 14 files changed, 864 insertions(+), 244 deletions(-) create mode 100644 src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml create mode 100644 src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml diff --git a/src/main/java/com/divudi/bean/common/DataAdministrationController.java b/src/main/java/com/divudi/bean/common/DataAdministrationController.java index 2fd8d615c2..e4731c289e 100644 --- a/src/main/java/com/divudi/bean/common/DataAdministrationController.java +++ b/src/main/java/com/divudi/bean/common/DataAdministrationController.java @@ -56,6 +56,8 @@ import com.divudi.entity.BillComponent; import com.divudi.entity.BillEntry; import com.divudi.entity.BillSession; +import com.divudi.entity.Family; +import com.divudi.entity.FamilyMember; import com.divudi.entity.Patient; import com.divudi.entity.PatientDeposit; import com.divudi.entity.PatientDepositHistory; @@ -89,6 +91,8 @@ import com.divudi.facade.CashTransactionHistoryFacade; import com.divudi.facade.DrawerEntryFacade; import com.divudi.facade.DrawerFacade; +import com.divudi.facade.FamilyFacade; +import com.divudi.facade.FamilyMemberFacade; import com.divudi.facade.PatientDepositFacade; import com.divudi.facade.PatientDepositHistoryFacade; import com.divudi.facade.PatientEncounterFacade; @@ -169,6 +173,10 @@ public class DataAdministrationController implements Serializable { @EJB PatientFacade patientFacade; @EJB + FamilyMemberFacade familyMemberFacade; + @EJB + FamilyFacade familyFacade; + @EJB PatientDepositFacade patientDepositFacade; @EJB PatientEncounterFacade patientEncounterFacade; @@ -490,6 +498,61 @@ public void retireAllBillRelatedData() { System.out.println(progressMessage); } + public void retireAllMembershipData() { + progress = 0; + progressMessage = "Starting retirement process..."; + System.out.println(progressMessage); + String jpql = "Select f from Family f where f.retired=:ret"; + Map params = new HashMap(); + params.put("ret", false); + List families; + + Date retiredAt = new Date(); // Common timestamp for all retire operations + WebUser retirer = sessionController.getLoggedUser(); // The user performing the operation + String uuid = CommonFunctions.generateUuid(); + + families = familyFacade.findByJpql(jpql, params); + for (Family f : families) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + familyFacade.edit(f); + } + + jpql = "Select p from Patient p where p.retired=:ret and p.person.membershipScheme is not null"; + params = new HashMap(); + params.put("ret", false); + List patients = patientFacade.findByJpql(jpql, params); + for (Patient f : patients) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + if (f.getPerson() != null) { + f.getPerson().setRetired(true); + f.getPerson().setRetirer(retirer); + f.getPerson().setRetiredAt(retiredAt); + f.getPerson().setRetireComments(uuid); + } + patientFacade.edit(f); + } + + List familyMembers; + jpql = "Select fm from FamilyMember fm where fm.retired=:ret"; + params = new HashMap(); + params.put("ret", false); + familyMembers = patientFacade.findByJpql(jpql, params); + for (FamilyMember f : familyMembers) { + f.setRetired(true); + f.setRetirer(retirer); + f.setRetiredAt(retiredAt); + f.setRetireComments(uuid); + familyMemberFacade.edit(f); + } + + } + public void retireAllPatientInvestigationRelatedData() { progress = 0; progressMessage = "Starting retirement process..."; @@ -565,7 +628,7 @@ private int retireEntities(List entities, Date retiredAt, WebUser retirer retirable.setRetirer(retirer); retirable.setRetireComments(uuid); facade.edit(entity); // Use the specific facade passed as a parameter - }else{ + } else { System.out.println("Entity that does not implement retirable"); System.out.println("entity = " + entity); } diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index 291a264bb9..8b6557b856 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -1852,6 +1852,7 @@ public void generateOPDWeeklyReport() { opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL); } + if (visitType == null) { opdBts.add(BillTypeAtomic.CC_BILL); opdBts.add(BillTypeAtomic.CC_BILL_REFUND); @@ -1899,8 +1900,10 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to7.containsKey(weekOfMonth) ? weeklyBillItemMap7to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null - ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + weeklyBillItemMap7to7.put(weekOfMonth, billItemMap); } else if (hourOfDay < 13) { @@ -1908,8 +1911,10 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap7to1.containsKey(weekOfMonth) ? weeklyBillItemMap7to1.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null - ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + weeklyBillItemMap7to1.put(weekOfMonth, billItemMap); } else { @@ -1917,8 +1922,10 @@ private void groupBillItemsDaily() { Map> billItemMap = weeklyBillItemMap1to7.containsKey(weekOfMonth) ? weeklyBillItemMap1to7.get(weekOfMonth) : new HashMap<>(); billItemMap.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null - ? billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + + .put(dayOfMonth, billItemMap.get(billItem.getItem().getName()) != null ? + billItemMap.get(billItem.getItem().getName()).getOrDefault(dayOfMonth, 0.0) + 1.0 : 1.0); + weeklyBillItemMap1to7.put(weekOfMonth, billItemMap); } @@ -2007,18 +2014,19 @@ private void groupBillItemsWeekly() { if (hourOfDay >= 19 || hourOfDay < 7) { // Between 7 PM to 7 AM billItemMap7to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()) != null - ? billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap7to7.get(billItem.getItem().getName()) != null ? + billItemMap7to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else if (hourOfDay < 13) { // Between 7 AM to 1 PM billItemMap7to1.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()) != null - ? billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap7to1.get(billItem.getItem().getName()) != null ? + billItemMap7to1.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); } else { // Between 1 PM to 7 PM billItemMap1to7.computeIfAbsent(billItem.getItem().getName(), k -> new HashMap<>()) - .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()) != null - ? billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + .put(weekOfMonth, billItemMap1to7.get(billItem.getItem().getName()) != null ? + billItemMap1to7.get(billItem.getItem().getName()).getOrDefault(weekOfMonth, 0.0) + 1.0 : 1.0); + } } @@ -2093,6 +2101,7 @@ private ReportTemplateRowBundle generateWeeklyBillItems(List bts // parameters.put("type", visitType); // } // } + if (getSearchKeyword().getItemName() != null && !getSearchKeyword().getItemName().trim().isEmpty()) { jpql += "AND ((bill.billPackege.name) like :itemName ) "; parameters.put("itemName", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%"); @@ -4712,6 +4721,7 @@ public Double calculateIpDueAmountSubTotalByBills(List bills) { return balance; } + public Double calculateIpGrossAmountNetTotal() { double grossAmountNetTotal = 0.0; Map> billMap = bundle.getGroupedBillItemsByInstitution(); @@ -4790,4 +4800,5 @@ public Double calculateIpDueAmountNetTotal() { return dueAmountNetTotal; } + } diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java index d0dba578c2..b7284205e3 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java @@ -791,7 +791,6 @@ public String generateFileNameForReport(String reportName) { return reportName.trim(); } - @Deprecated public void generateGRNReportTableByBillItem(List bt) { bills = null; totalCreditPurchaseValue = 0.0; @@ -886,6 +885,7 @@ public String navigateBackToGeneratedGrnDetailedRportTable() { } public void generateGrnReportTable() { + bills = null; totalCreditPurchaseValue = 0.0; totalCashPurchaseValue = 0.0; @@ -894,8 +894,10 @@ public void generateGrnReportTable() { List bt = new ArrayList<>(); if ("detailReport".equals(reportType)) { bt.add(BillType.PharmacyGrnBill); + generateGRNReportTableByBillItem(bt); } else if ("returnReport".equals(reportType)) { bt.add(BillType.PharmacyGrnReturn); + generateGRNReportTableByBillItem(bt); } else if ("summeryReport".equals(reportType)) { bt.add(BillType.PharmacyGrnBill); bt.add(BillType.PharmacyGrnReturn); @@ -935,14 +937,10 @@ public void generateGrnReportTable() { tmp.put("pm", paymentMethod); } - if (fromInstitution != null && "detailReport".equals(reportType)) { + if (fromInstitution != null) { sql += " AND b.fromInstitution = :supplier"; tmp.put("supplier", fromInstitution); } - if (fromInstitution != null && "returnReport".equals(reportType)) { - sql += " AND b.toInstitution = :supplier"; - tmp.put("supplier", fromInstitution); - } sql += " order by b.id desc"; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java index 5d31ac906c..60c0b8706e 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java @@ -1449,13 +1449,11 @@ public void setBillItem(BillItem billItem) { // } @Override public PaymentMethod getPaymentMethod() { - System.out.println("get paymentMethod = " + paymentMethod); return paymentMethod; } @Override public void setPaymentMethod(PaymentMethod paymentMethod) { - System.out.println("setPaymentMethod = " + paymentMethod); this.paymentMethod = paymentMethod; } diff --git a/src/main/java/com/divudi/entity/Person.java b/src/main/java/com/divudi/entity/Person.java index 8ef4200b01..049a524959 100644 --- a/src/main/java/com/divudi/entity/Person.java +++ b/src/main/java/com/divudi/entity/Person.java @@ -117,7 +117,6 @@ public class Person implements Serializable, RetirableEntity { private Item religion; @ManyToOne - @Deprecated private MembershipScheme membershipScheme; @Transient diff --git a/src/main/webapp/dataAdmin/admin_functions.xhtml b/src/main/webapp/dataAdmin/admin_functions.xhtml index eff516fade..266899d09a 100644 --- a/src/main/webapp/dataAdmin/admin_functions.xhtml +++ b/src/main/webapp/dataAdmin/admin_functions.xhtml @@ -15,175 +15,219 @@
-
+
+ +
+
+
-
+
-
+
-
- - - - - - - - - - - - - - - - - - - - - - - Retired Functions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ diff --git a/src/main/webapp/inward/inward_admission.xhtml b/src/main/webapp/inward/inward_admission.xhtml index 76d2c225b8..28e0b1eca3 100644 --- a/src/main/webapp/inward/inward_admission.xhtml +++ b/src/main/webapp/inward/inward_admission.xhtml @@ -130,7 +130,7 @@ id="refCon" required="true" requiredMessage="Please select referring consultant" completeMethod="#{consultantController.completeConsultant}" - var="mysp" itemLabel="#{mysp.person.nameWithTitle}" itemValue="#{mysp}" + var="mysp" itemLabel="#{mysp.person.name}" itemValue="#{mysp}" styleClass="form-control w-100" class="w-100" placeholder="Referring Consultant" inputStyleClass="w-100"> @@ -141,7 +141,9 @@ forceSelection="true" id="scStaff" placeholder="OPD Doctor" value="#{admissionController.current.opdDoctor}" completeMethod="#{doctorController.completeDoctor}" - var="mys" itemLabel="#{mys.person.nameWithTitle}" itemValue="#{mys}" + var="mys" + itemLabel="#{mys.person.name}" + itemValue="#{mys}" styleClass="form-control w-100" class="w-100" inputStyleClass="w-100" @@ -152,7 +154,7 @@ - + + + diff --git a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml index 2dca0457cd..a1b61689d1 100644 --- a/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_bill_retail_sale_3.xhtml @@ -606,10 +606,6 @@ - - - -
@@ -663,11 +659,9 @@ -
-
@@ -679,7 +673,6 @@
- @@ -688,6 +681,7 @@ + @@ -697,11 +691,8 @@ - - - diff --git a/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml b/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml index 6503e7087c..ccf9a3116c 100644 --- a/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml @@ -5,6 +5,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core" + xmlns:phi="http://xmlns.jcp.org/jsf/composite/pharmacy" xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common" xmlns:pharmacy="http://xmlns.jcp.org/jsf/composite/pharmacy"> @@ -12,7 +13,7 @@ - +
@@ -100,15 +101,24 @@ - + - + - + @@ -147,6 +157,12 @@ + + + + + + diff --git a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml index 0b16ec7821..5857251ca5 100644 --- a/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml @@ -53,7 +53,7 @@ value="To Cancel" icon="fa fa-cancel" class="ui-button-danger" - action="pharmacy_cancel_bill_retail" + action="pharmacy_cancel_bill_retail?faces-redirect=true" disabled="#{pharmacyBillSearch.bill.cancelled}" rendered="#{webUserController.hasPrivilege('PharmacySaleCancel')}"> diff --git a/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml new file mode 100644 index 0000000000..1cc04f930d --- /dev/null +++ b/src/main/webapp/resources/pharmacy/sale_bill_cancellation_five_five_custom_3.xhtml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name : + + Age/Sex : + +
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.billedBill.deptId}
+ +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
#{s.index +1} #{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Total: + + + +
Discount: + + + +
Net Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + + + + +
+ + + + + + +
+ + +
+ + + + + diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml index b4d4679c98..99a11d7fc3 100644 --- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml @@ -40,39 +40,51 @@ - - + - - - + + + + + + + + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} + - - + - - - + + - - - - - + + + + + + +
Patient Name: + + Name : Patient Age/Sex: - - Age/Sex : + +
Bill Date: + Bill Date: + Bill Time: + + Bill Time: +
Bill No:#{cc.attrs.bill.deptId}Department:PharmacyBill No:#{cc.attrs.bill.deptId}
@@ -134,11 +146,14 @@
Discount: - + + +
Net Total: @@ -152,7 +167,7 @@
No of Items: + @@ -160,45 +175,58 @@
- +
- - - + -
- - -
- - - -
- - - + 		+ + - - - - - - - - + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + +
+ + + + + + +
+ - - - + - \ No newline at end of file + + diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml new file mode 100644 index 0000000000..4eab176d23 --- /dev/null +++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3_2.xhtml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + #{pharmacySaleController.printBill.patient.person.sex.shortLabel} + + + + + + + + + + + + + + + + +
Name : + + Age/Sex : + +
Bill Date: + + + + Bill Time: + + + +
Bill No:#{cc.attrs.bill.deptId}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NoItem NameRateQtyValue
#{s.index +1} #{item.item.name} + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Total: + + + +
Discount: + + + +
Net Total: + + + +
No of Items: + + + +
+ + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + + + + +
+ + + + + + +
+ + +
+ + + + + From 1750b5b28e80489ceca834685efabebcf67c48c1 Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 16:45:32 +0530 Subject: [PATCH 61/66] Signed-off-by: Sandith Pivithuru --- src/main/java/com/divudi/entity/pharmacy/Stock.java | 9 +++++++++ src/main/resources/META-INF/persistence.xml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/divudi/entity/pharmacy/Stock.java b/src/main/java/com/divudi/entity/pharmacy/Stock.java index d1d86a8773..7a8a3055ff 100644 --- a/src/main/java/com/divudi/entity/pharmacy/Stock.java +++ b/src/main/java/com/divudi/entity/pharmacy/Stock.java @@ -55,6 +55,7 @@ public class Stock implements Serializable, RetirableEntity { private Date retiredAt; private String retireComments; + private String stockLocator; @ManyToOne Stock parentStock; @@ -220,4 +221,12 @@ public void setRetireComments(String retireComments) { this.retireComments = retireComments; } + public String getStockLocator() { + return stockLocator; + } + + public void setStockLocator(String stockLocator) { + this.stockLocator = stockLocator; + } + } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e1279e8abb..3859a00e7b 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_DATASOURCE} + jdbc/ruhunu false @@ -13,7 +13,7 @@ - ${JDBC_AUDIT_DATASOURCE} + jdbc/ruhunuAudit false From 9faaccf32acfbaa2937742f69bd1798583dbd9f9 Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 16:45:58 +0530 Subject: [PATCH 62/66] Signed-off-by: Sandith Pivithuru --- src/main/webapp/reports/inventoryReports/expiry_item.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index db02740359..8684c097a7 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -253,7 +253,7 @@ currentPageReportTemplate="Showing {startRecord} to {endRecord} of {totalRecords}" rowsPerPageTemplate="5,10,15,25,50,100,500,1000"> - + From 701955fa5185a862e68237e3f3f2261112030a7d Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 17:01:31 +0530 Subject: [PATCH 63/66] Signed-off-by: Sandith Pivithuru --- .../inventoryReports/expiry_item.xhtml | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index 8684c097a7..1aa492819e 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -230,11 +230,32 @@ value="Process" action="#{pharmacyReportController.processExpiryItemReport()}"> - + + - + + - + + @@ -243,7 +264,7 @@
Expiry Item Report
- - - - - - - @@ -280,9 +295,6 @@ - - - From 2cc121fc1d16dbee5dcdecb7e948e0844a3d36ea Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 17:05:56 +0530 Subject: [PATCH 64/66] Signed-off-by: Sandith Pivithuru fixed expiry item report --- src/main/resources/META-INF/persistence.xml | 4 ++-- src/main/webapp/reports/inventoryReports/expiry_item.xhtml | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 3859a00e7b..e1279e8abb 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/ruhunu + ${JDBC_DATASOURCE} false @@ -13,7 +13,7 @@ - jdbc/ruhunuAudit + ${JDBC_AUDIT_DATASOURCE} false diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index 1aa492819e..47880ccbca 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -359,11 +359,7 @@ - - - - - + From 5d37218551157b883d0a18437dd09364f669bdc7 Mon Sep 17 00:00:00 2001 From: Sandith Pivithuru Date: Mon, 6 Jan 2025 17:07:18 +0530 Subject: [PATCH 65/66] Signed-off-by: Sandith Pivithuru --- src/main/webapp/reports/inventoryReports/expiry_item.xhtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml index 47880ccbca..f281f67903 100644 --- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml +++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml @@ -359,7 +359,8 @@ - + + From 3efa4fca9d07d2ee2f8807a02ef5dc057b6191a4 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Mon, 6 Jan 2025 17:22:36 +0530 Subject: [PATCH 66/66] Signed-off-by: Isuru Ranaweera --- src/main/java/com/divudi/bean/common/ReportsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index 8b6557b856..4a2d2b3815 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -2832,7 +2832,7 @@ public void generateCollectionCenterBookWiseDetailReport() { opdBts.add(BillTypeAtomic.CC_BILL); opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION); opdBts.add(BillTypeAtomic.CC_BILL_REFUND); - opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL); +// opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL); bundle.setName("Bills"); bundle.setBundleType("billList");