From 604da16b6c116b841aec700b1e13ff9dced5929d Mon Sep 17 00:00:00 2001 From: Piyankara N W M G P Date: Wed, 24 Jul 2024 17:54:27 +0530 Subject: [PATCH 1/7] Signed-off-by: Piyankara N W M G P closes Issue#6559 --- .../lab/PatientInvestigationController.java | 25 ++++- src/main/resources/META-INF/persistence.xml | 4 +- src/main/webapp/lab/accept_samples.xhtml | 20 ++++ src/main/webapp/lab/collect_samples.xhtml | 20 ++++ src/main/webapp/lab/divide_samples.xhtml | 20 ++++ .../lab/generate_barcodes_for_lab.xhtml | 19 ++++ src/main/webapp/lab/reject_samples.xhtml | 20 ++++ src/main/webapp/lab/revert_samples.xhtml | 20 ++++ src/main/webapp/lab/sample_at_lab_index.xhtml | 85 +++++++++++++++++ src/main/webapp/lab/sample_index.xhtml | 53 ++++++----- src/main/webapp/lab/sent_to_lab.xhtml | 13 +++ src/main/webapp/resources/ezcomp/menu.xhtml | 91 ++++++++++--------- 12 files changed, 316 insertions(+), 74 deletions(-) create mode 100644 src/main/webapp/lab/accept_samples.xhtml create mode 100644 src/main/webapp/lab/collect_samples.xhtml create mode 100644 src/main/webapp/lab/divide_samples.xhtml create mode 100644 src/main/webapp/lab/generate_barcodes_for_lab.xhtml create mode 100644 src/main/webapp/lab/reject_samples.xhtml create mode 100644 src/main/webapp/lab/revert_samples.xhtml create mode 100644 src/main/webapp/lab/sample_at_lab_index.xhtml create mode 100644 src/main/webapp/lab/sent_to_lab.xhtml diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java index ca68b449ee..462602c82e 100644 --- a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java +++ b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java @@ -1134,7 +1134,30 @@ public String navigateToCollelcted() { listPatientInvestigationsWhereSamplingCompleting(); return "/lab/patient_investigations_collected?faces-redirect=true"; } - + public String navigateToSentToLab(){ + return "/lab/sent_to_lab?faces-redirect=true"; + } + +// Navigation Lab sampling at lab for barcode generate page + public String navigateToGenerateBarcodesForLab(){ + return "/lab/generate_barcodes_for_lab?faces-redirect=true"; + } + + public String navigateToCollectSamples(){ + return "/lab/collect_samples?faces-redirect=true"; + } + public String navigateToAcceptSamples(){ + return "/lab/accept_samples?faces-redirect=true"; + } + public String navigateToRejectSamples(){ + return "/lab/reject_samples?faces-redirect=true"; + } + public String navigateToRevertSamples(){ + return "/lab/revert_samples?faces-redirect=true"; + } + public String navigateToDivideSamples(){ + return "/lab/divide_samples?faces-redirect=true"; + } public void prepareToSample() { String temSql; Map temMap = new HashMap(); diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 6d8623993e..42fe5625f4 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,14 +2,14 @@ - jdbc/arogya + jdbc/hims false - jdbc/arogyaAudit + jdbc/himsAduit false diff --git a/src/main/webapp/lab/accept_samples.xhtml b/src/main/webapp/lab/accept_samples.xhtml new file mode 100644 index 0000000000..8103a6d806 --- /dev/null +++ b/src/main/webapp/lab/accept_samples.xhtml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/collect_samples.xhtml b/src/main/webapp/lab/collect_samples.xhtml new file mode 100644 index 0000000000..4655ff9616 --- /dev/null +++ b/src/main/webapp/lab/collect_samples.xhtml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/divide_samples.xhtml b/src/main/webapp/lab/divide_samples.xhtml new file mode 100644 index 0000000000..b1670b801c --- /dev/null +++ b/src/main/webapp/lab/divide_samples.xhtml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/generate_barcodes_for_lab.xhtml b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml new file mode 100644 index 0000000000..31729ee468 --- /dev/null +++ b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/reject_samples.xhtml b/src/main/webapp/lab/reject_samples.xhtml new file mode 100644 index 0000000000..45fe692674 --- /dev/null +++ b/src/main/webapp/lab/reject_samples.xhtml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/revert_samples.xhtml b/src/main/webapp/lab/revert_samples.xhtml new file mode 100644 index 0000000000..b10a3445e6 --- /dev/null +++ b/src/main/webapp/lab/revert_samples.xhtml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/src/main/webapp/lab/sample_at_lab_index.xhtml b/src/main/webapp/lab/sample_at_lab_index.xhtml new file mode 100644 index 0000000000..25647ac3d8 --- /dev/null +++ b/src/main/webapp/lab/sample_at_lab_index.xhtml @@ -0,0 +1,85 @@ + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + +
+ +
+
+ + + +
+
+ + + + + diff --git a/src/main/webapp/lab/sample_index.xhtml b/src/main/webapp/lab/sample_index.xhtml index 567ff86705..ea8005118b 100644 --- a/src/main/webapp/lab/sample_index.xhtml +++ b/src/main/webapp/lab/sample_index.xhtml @@ -7,7 +7,7 @@ - +
@@ -15,7 +15,8 @@ @@ -23,46 +24,44 @@ class="w-100" ajax="false" value="Collected Samples" - action="#{patientInvestigationController.navigateToCollelcted()}" /> - + icon="fa fa-vials" + action="#{patientInvestigationController.navigateToCollelcted()}"> - + value="Sent to Lab" + icon="fa fa-flask" + action="#{patientInvestigationController.navigateToSentToLab()}"> -
- + +
- -
- - - - - - - diff --git a/src/main/webapp/lab/sent_to_lab.xhtml b/src/main/webapp/lab/sent_to_lab.xhtml new file mode 100644 index 0000000000..87e19b3d3c --- /dev/null +++ b/src/main/webapp/lab/sent_to_lab.xhtml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml index 54dc7a7edc..05ea2b32f3 100644 --- a/src/main/webapp/resources/ezcomp/menu.xhtml +++ b/src/main/webapp/resources/ezcomp/menu.xhtml @@ -397,12 +397,15 @@ + + + + - @@ -629,7 +632,7 @@ actionListener="#{searchController.makeListNull()}" rendered="#{webUserController.hasPrivilege('PharmacyDisbursementRequest') and !configOptionApplicationController.getBooleanValueByKey('Pharmacy Transer Request With Approval')}" icon="fas fa-hand-holding-medical"> - + - + @@ -1282,9 +1285,9 @@ + icon="fas fa-refresh" + ajax="false" + action="#{financialTransactionController.refreshCashNetTotalForMenu()}" />
From 1c13f25de83ce4718baf7031fc7b245a1223461c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 04:58:56 +0000 Subject: [PATCH 2/7] Update version to 3.0.0.20240725.1 --- .github/last_date.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/last_date.txt b/.github/last_date.txt index 833d506feb..503038db09 100644 --- a/.github/last_date.txt +++ b/.github/last_date.txt @@ -1 +1 @@ -20240723 +20240725 diff --git a/README.md b/README.md index 70e1ad9de3..81f471ade0 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240723.1 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.1 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 50f14cec99..6797d8abf3 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240723.1 +3.0.0.20240725.1 From 46ecd6a6cfb6285fb76082bebf2c4ee34287e861 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:02:21 +0000 Subject: [PATCH 3/7] Update version to 3.0.0.20240725.2 --- .github/counter.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/counter.txt b/.github/counter.txt index d00491fd7e..0cfbf08886 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -1 +2 diff --git a/README.md b/README.md index 81f471ade0..cea369dae5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240725.1 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.2 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 6797d8abf3..43440dcd30 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240725.1 +3.0.0.20240725.2 From c608c90a67fd6649e1048113f72db3c01a99d94c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:22:56 +0000 Subject: [PATCH 4/7] Update version to 3.0.0.20240725.3 --- .github/counter.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/counter.txt b/.github/counter.txt index 0cfbf08886..00750edc07 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -2 +3 diff --git a/README.md b/README.md index cea369dae5..7bcfe60b08 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240725.2 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.3 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 43440dcd30..458b51d54d 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240725.2 +3.0.0.20240725.3 From 6018b71957b45801ac98b96348ddc9b39f3c6215 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 06:07:49 +0000 Subject: [PATCH 5/7] Update version to 3.0.0.20240725.4 --- .github/counter.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/counter.txt b/.github/counter.txt index 00750edc07..b8626c4cff 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -3 +4 diff --git a/README.md b/README.md index 7bcfe60b08..f39a3eabec 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240725.3 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.4 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 458b51d54d..4060f9d972 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240725.3 +3.0.0.20240725.4 From 0e505c45d20b159661bb5263132e3e8707c86bcf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 06:12:01 +0000 Subject: [PATCH 6/7] Update version to 3.0.0.20240725.5 --- .github/counter.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/counter.txt b/.github/counter.txt index b8626c4cff..7ed6ff82de 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -4 +5 diff --git a/README.md b/README.md index f39a3eabec..723813540a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240725.4 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.5 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 4060f9d972..9bc644f044 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240725.4 +3.0.0.20240725.5 From 005ad37eb6bbc2f39c0073c1e2bfc47a7c8f7758 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 07:57:19 +0000 Subject: [PATCH 7/7] Update version to 3.0.0.20240725.6 --- .github/counter.txt | 2 +- README.md | 2 +- src/main/resources/VERSION.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/counter.txt b/.github/counter.txt index 7ed6ff82de..1e8b314962 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -5 +6 diff --git a/README.md b/README.md index 723813540a..d47b17eeb5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio -Current Version: 3.0.0.20240725.5 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240725.6 (This line will be automatically updated to reflect the latest version) ## History diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 9bc644f044..c7d027ae5d 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240725.5 +3.0.0.20240725.6