From ee5d84f0089cee0376d22a37bbc01271795b7ae1 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Mon, 22 Jul 2024 09:24:10 +0530 Subject: [PATCH 01/20] Signed-off-by: buddhika75 --- .../FinancialTransactionController.java | 30 +++++++++++++------ .../analytics/ReportTemplateController.java | 11 ------- .../divudi/bean/common/EnumController.java | 1 + src/main/java/com/divudi/entity/Item.java | 1 - 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java index 3675f35498..3d96d98211 100644 --- a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java +++ b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java @@ -130,8 +130,6 @@ public class FinancialTransactionController implements Serializable { private Date fromDate; private Date toDate; - private Date fromDate; - private Date toDate; private ReportTemplateRowBundle paymentSummaryBundle; @@ -587,6 +585,22 @@ public void processDayEndSummary() { createPaymentSummery(); } + + public void fillPaymentsForDateRange() { + System.out.println("fillPaymentsForDateRange"); + paymentsFromShiftSratToNow = new ArrayList<>(); + String jpql = "SELECT p " + + "FROM Payment p " + + "WHERE p.bill.retired <> :ret " + + "AND p.bill.createdAt between :fd and :td " + + "ORDER BY p.id DESC"; + Map m = new HashMap<>(); + m.put("fd", getFromDate()); + m.put("td", getToDate()); + m.put("ret", true); + System.out.println("m = " + m); + System.out.println("jpql = " + jpql); + } private void createPaymentSummery() { System.out.println("createPaymentSummery"); @@ -648,16 +662,14 @@ private void createPaymentSummery() { return row; }).collect(Collectors.toList()); - - if (paymentSummaryBundle != null) { - paymentSummaryBundle.getReportTemplateRows().addAll(rows); - } + getPaymentSummaryBundle().getReportTemplateRows().addAll(rows); + } public String navigateToViewEndOfSelectedShiftStartSummaryBill(Bill startBill) { resetClassVariables(); if (startBill == null) { JsfUtil.addErrorMessage("No Start Bill"); - return null; + return ""; } nonClosedShiftStartFundBill = startBill; fillPaymentsFromShiftStartToNow(startBill, startBill.getCreater()); @@ -1609,6 +1621,7 @@ public ReportTemplateRowBundle getPaymentSummaryBundle() { public void setPaymentSummaryBundle(ReportTemplateRowBundle paymentSummaryBundle) { this.paymentSummaryBundle = paymentSummaryBundle; + } public List getShiaftStartBills() { return shiaftStartBills; @@ -1616,7 +1629,6 @@ public List getShiaftStartBills() { public void setShiaftStartBills(List shiaftStartBills) { this.shiaftStartBills = shiaftStartBills; - } -} +} \ No newline at end of file diff --git a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java index 0abd59db59..db3238f2af 100644 --- a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java +++ b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java @@ -68,19 +68,11 @@ public class ReportTemplateController implements Serializable { private WebUser user; private Staff staff; - - private Date date; - private Date fromDate; - private Date toDate; - private Institution institution; private Institution creditCompany; - private Department department; private Institution fromInstitution; private Department fromDepartment; private Institution toInstitution; private Department toDepartment; - private WebUser user; - private Staff staff; private List ReportTemplateRows; private ReportTemplateRowBundle reportTemplateRowBundle; @@ -529,9 +521,6 @@ private void handlePaymentTypeSummaryPayments() { private void handlePaymentTypeSummaryUsingBills() { // Method implementation here - public void processReport() { - - } public void saveSelected() { diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java index 1885be682b..1c586fb0e4 100644 --- a/src/main/java/com/divudi/bean/common/EnumController.java +++ b/src/main/java/com/divudi/bean/common/EnumController.java @@ -9,6 +9,7 @@ import com.divudi.data.BillClassType; import com.divudi.data.BillItemStatus; import com.divudi.data.BillType; +import com.divudi.data.BillTypeAtomic; import com.divudi.data.CalculationType; import com.divudi.data.CreditDuration; import com.divudi.data.CssVerticalAlign; diff --git a/src/main/java/com/divudi/entity/Item.java b/src/main/java/com/divudi/entity/Item.java index 7350274e2a..457b493f71 100644 --- a/src/main/java/com/divudi/entity/Item.java +++ b/src/main/java/com/divudi/entity/Item.java @@ -86,7 +86,6 @@ public class Item implements Serializable, Comparable { private boolean hasReportFormat; private int numberOfDaysToMarkAsShortExpiary; - private boolean canSechduleForOtherDays; @ManyToOne Category category; From 97674fdf6ff9446fda4ab3c9aa968caf13890c56 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Tue, 23 Jul 2024 09:02:04 +0530 Subject: [PATCH 02/20] Signed-off-by: buddhika75 --- src/main/resources/META-INF/persistence.xml | 4 ++-- src/main/webapp/WEB-INF/glassfish-web.xml | 2 +- src/main/webapp/cashier/index.xhtml | 22 +++++++++++-------- .../collecting_centre_search_bill_own.xhtml | 2 +- .../resources/paymentMethod/creditCard.xhtml | 5 +++-- src/main/webapp/store/store_grn.xhtml | 4 ++-- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 6d8623993e..36252c3a7b 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,14 +2,14 @@ - jdbc/arogya + jdbc/ruhunuDemo false - jdbc/arogyaAudit + jdbc/ruhunuDemoAudit false diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml index d92795745e..9841584308 100644 --- a/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/src/main/webapp/WEB-INF/glassfish-web.xml @@ -1,7 +1,7 @@ - /sethmademo + /ruhunuDemo diff --git a/src/main/webapp/cashier/index.xhtml b/src/main/webapp/cashier/index.xhtml index 4a3dd98fb3..7db39be7e9 100644 --- a/src/main/webapp/cashier/index.xhtml +++ b/src/main/webapp/cashier/index.xhtml @@ -6,12 +6,14 @@ xmlns:h="http://xmlns.jcp.org/jsf/html"> + + + +
+
-
-
-
- -
-
- - + +
+
+ + +
-
+ + diff --git a/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml b/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml index 1c223b3b67..68cfb08016 100644 --- a/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml +++ b/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml @@ -127,7 +127,7 @@ + action="#{billSearch.navigateToRefundCollectingCentreBill()}"> #{billController.findBillbyID(bill.id)} diff --git a/src/main/webapp/resources/paymentMethod/creditCard.xhtml b/src/main/webapp/resources/paymentMethod/creditCard.xhtml index aefed9111a..cc18acc884 100644 --- a/src/main/webapp/resources/paymentMethod/creditCard.xhtml +++ b/src/main/webapp/resources/paymentMethod/creditCard.xhtml @@ -15,14 +15,15 @@
- + diff --git a/src/main/webapp/store/store_grn.xhtml b/src/main/webapp/store/store_grn.xhtml index 93c51ed66c..953aa1ce22 100644 --- a/src/main/webapp/store/store_grn.xhtml +++ b/src/main/webapp/store/store_grn.xhtml @@ -245,9 +245,9 @@ + value="#{storeGrnController.currentExpense.rate}" style="width:100px" /> Date: Wed, 24 Jul 2024 09:01:51 +0530 Subject: [PATCH 03/20] Signed-off-by: buddhika75 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 343837f334..d9deaa1d92 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.divudi - sethma + ruhunu-demo 3.0.0 war ruhunu-demo From d517a9bb43839dd73365994adce20165b866ab81 Mon Sep 17 00:00:00 2001 From: "Dr. M H B Ariyaratne" Date: Fri, 26 Jul 2024 08:58:28 +0530 Subject: [PATCH 04/20] Signed-off-by: Dr. M H B Ariyaratne --- .../lab/PatientInvestigationController.java | 222 +++++++++++++++++- .../divudi/data/lab/PatientSampleWrapper.java | 9 + src/main/webapp/lab/generate_barcode_p.xhtml | 190 ++++++--------- 3 files changed, 297 insertions(+), 124 deletions(-) diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java index 094ffc9b1d..c955b2ee14 100644 --- a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java +++ b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java @@ -52,7 +52,9 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.lab.BillBarcode; import com.divudi.data.lab.PatientInvestigationWrapper; +import com.divudi.data.lab.PatientSampleWrapper; import com.divudi.data.lab.SampleTubeLabel; +import com.divudi.entity.WebUser; import com.divudi.java.CommonFunctions; import com.divudi.ws.lims.Lims; import java.io.Serializable; @@ -191,7 +193,8 @@ public class PatientInvestigationController implements Serializable { private List sampleTubeLabels; - List< BillBarcode> billBarcodes; + private List billBarcodes; + private List selectedBillBarcodes; public String navigateToPrintBarcodeFromMenu() { return "/lab/sample_barcode_printing?faces-redirect=true"; @@ -1172,6 +1175,31 @@ public void prepareToSample() { checkRefundBillItems(lstToSamle); } + public void generateBarcodesForSelectedBills() { + if (selectedBillBarcodes == null) { + JsfUtil.addErrorMessage("No Bills Seelcted"); + return; + } + if (selectedBillBarcodes.isEmpty()) { + JsfUtil.addErrorMessage("No Bills Seelcted"); + return; + } + for (BillBarcode bb : selectedBillBarcodes) { + List bs = new ArrayList<>(); + bs.add(bb.getBill()); + List psws = new ArrayList<>(); + List pss = prepareSampleCollectionByBillsForRequestss(bs, sessionController.getLoggedUser()); + if(pss!=null){ + for(PatientSample ps:pss){ + PatientSampleWrapper ptsw = new PatientSampleWrapper(ps); + psws.add(ptsw); + } + } + bb.setPatientSampleWrappers(psws); + } + + } + public void listPatientInvestigationAwaitingSamplling() { String temSql; Map temMap = new HashMap(); @@ -1187,7 +1215,7 @@ public void listBillsToGenerateBarcodes() { temSql = "SELECT i " + " FROM PatientInvestigation i " + " where i.retired=:ret " - + " and i.barcodeGenerated=:gb " + + " and i.barcodeGenerated=:bg " + " and i.billItem.bill.billDate between :fromDate and :toDate " + " order by i.id desc"; temMap.put("fromDate", getFromDate()); @@ -2051,6 +2079,22 @@ public void setLstForSampleManagement(List lstForSampleMan this.lstForSampleManagement = lstForSampleManagement; } + public List< BillBarcode> getBillBarcodes() { + return billBarcodes; + } + + public void setBillBarcodes(List< BillBarcode> billBarcodes) { + this.billBarcodes = billBarcodes; + } + + public List getSelectedBillBarcodes() { + return selectedBillBarcodes; + } + + public void setSelectedBillBarcodes(List selectedBillBarcodes) { + this.selectedBillBarcodes = selectedBillBarcodes; + } + /** * */ @@ -2102,12 +2146,178 @@ public void setCommonController(CommonController commonController) { this.commonController = commonController; } - public BillItemFacade getBillItemFacade() { - return billItemFacade; + public List prepareSampleCollectionByBillsForRequestss(List bills, WebUser wu) { + String j = ""; + Map m; + Map rPatientSamplesMap = new HashMap<>(); + + if (bills == null) { + return null; + } + + for (Bill b : bills) { + m = new HashMap(); + m.put("can", false); + m.put("bill", b); + j = "Select pi from PatientInvestigation pi " + + " where pi.cancelled=:can " + + " and pi.billItem.bill=:bill"; + List pis = ejbFacade.findByJpql(j, m); + + if (pis == null) { + return null; + } + + for (PatientInvestigation ptix : pis) { + + Investigation ix = ptix.getInvestigation(); + + if (ix == null) { + continue; + } + + ptix.setCollected(true); + ptix.setSampleCollecter(wu); + ptix.setSampleDepartment(wu.getDepartment()); + ptix.setSampleInstitution(wu.getInstitution()); + ptix.setSampledAt(new Date()); + ejbFacade.edit(ptix); + + List ixis = getItems(ix); + + if (ixis == null) { + continue; + } + + for (InvestigationItem ixi : ixis) { + + if (ixi.getIxItemType() == InvestigationItemType.Value) { + + if (ixi.getTube() == null) { + continue; + } + if (ixi.getSample() == null) { + continue; + } + + j = "select ps from PatientSample ps " + + " where ps.tube=:tube " + + " and ps.sample=:sample " + + " and ps.machine=:machine " + + " and ps.patient=:pt " + + " and ps.bill=:bill "; +// + " and ps.collected=:ca + m = new HashMap(); + m.put("tube", ixi.getTube()); + + m.put("sample", ixi.getSample()); + + m.put("machine", ixi.getMachine()); + + m.put("pt", b.getPatient()); + + m.put("bill", b); +// m.put("ca", false); + if (ix.isHasMoreThanOneComponant()) { + j += " and ps.investigationComponant=:sc "; + m.put("sc", ixi.getSampleComponent()); + } + + PatientSample pts = patientSampleFacade.findFirstByJpql(j, m); + if (pts == null) { + pts = new PatientSample(); + + pts.setTube(ixi.getTube()); + pts.setSample(ixi.getSample()); + if (ix.isHasMoreThanOneComponant()) { + pts.setInvestigationComponant(ixi.getSampleComponent()); + } + pts.setMachine(ixi.getMachine()); + pts.setPatient(b.getPatient()); + pts.setBill(b); + + pts.setSampleDepartment(wu.getDepartment()); + pts.setSampleInstitution(wu.getInstitution()); + pts.setSampleCollecter(wu); + pts.setSampledAt(new Date()); + pts.setCreatedAt(new Date()); + pts.setCreater(wu); + pts.setCollected(false); + pts.setReadyTosentToAnalyzer(false); + pts.setSentToAnalyzer(false); + patientSampleFacade.create(pts); + } + rPatientSamplesMap.put(pts.getId(), pts); + + PatientSampleComponant ptsc; + j = "select ps from PatientSampleComponant ps " + + " where ps.patientSample=:pts " + + " and ps.bill=:bill " + + " and ps.patient=:pt " + + " and ps.patientInvestigation=:ptix " + + " and ps.investigationComponant=:ixc"; + m = new HashMap(); + m.put("pts", pts); + m.put("bill", b); + m.put("pt", b.getPatient()); + m.put("ptix", ptix); + m.put("ixc", ixi.getSampleComponent()); + m.put("pts", pts); + + m.put("bill", b); + + m.put("pt", b.getPatient()); + + m.put("ptix", ptix); + + m.put("ixc", ixi.getSampleComponent()); + + ptsc = patientSampleComponantFacade.findFirstByJpql(j, m); + + if (ptsc == null) { + ptsc = new PatientSampleComponant(); + ptsc.setPatientSample(pts); + ptsc.setBill(b); + ptsc.setPatient(b.getPatient()); + ptsc.setPatientInvestigation(ptix); + ptsc.setInvestigationComponant(ixi.getSampleComponent()); + ptsc.setCreatedAt(new Date()); + ptsc.setCreater(wu); + patientSampleComponantFacade.create(ptsc); + } + } + } + } + + } + + List rPatientSamples = new ArrayList<>(rPatientSamplesMap.values()); + return rPatientSamples; } - public void setBillItemFacade(BillItemFacade billItemFacade) { - this.billItemFacade = billItemFacade; + public List getItems(Investigation ix) { + List iis; + if (ix == null) { + return new ArrayList<>(); + } + Investigation temIx = ix; + if (ix.getReportedAs() != null) { + if (ix.getReportedAs() instanceof Investigation) { + temIx = (Investigation) ix.getReportedAs(); + } + } + + if (ix.getId() != null) { + String temSql; + temSql = "SELECT i FROM InvestigationItem i where i.retired<>true and i.item=:item order by i.riTop, i.riLeft"; + Map m = new HashMap(); + m.put("item", temIx); + + iis = investigationItemFacade.findByJpql(temSql, m); + } else { + iis = new ArrayList<>(); + } + return iis; } } diff --git a/src/main/java/com/divudi/data/lab/PatientSampleWrapper.java b/src/main/java/com/divudi/data/lab/PatientSampleWrapper.java index aa6ab84e76..e55af8e0b0 100644 --- a/src/main/java/com/divudi/data/lab/PatientSampleWrapper.java +++ b/src/main/java/com/divudi/data/lab/PatientSampleWrapper.java @@ -10,6 +10,15 @@ public class PatientSampleWrapper { private PatientSample patientSample; private boolean selected; + public PatientSampleWrapper() { + } + + public PatientSampleWrapper(PatientSample patientSample) { + this.patientSample = patientSample; + } + + + public PatientSample getPatientSample() { return patientSample; } diff --git a/src/main/webapp/lab/generate_barcode_p.xhtml b/src/main/webapp/lab/generate_barcode_p.xhtml index 8e4be9fcd9..9d5124089b 100644 --- a/src/main/webapp/lab/generate_barcode_p.xhtml +++ b/src/main/webapp/lab/generate_barcode_p.xhtml @@ -22,148 +22,102 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + class="m-2" + value="#{smpIx.bill.deptId}" + action="#{billSearch.navigateToViewOpdBill()}"> + - - - - - + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + + + From 0d1e8c937892c75f3f6867579427f38e6606f738 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Fri, 26 Jul 2024 09:00:07 +0530 Subject: [PATCH 05/20] Signed-off-by: buddhika75 --- .../lab/patient_investigations_collected.xhtml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/webapp/lab/patient_investigations_collected.xhtml b/src/main/webapp/lab/patient_investigations_collected.xhtml index 0d7c3e0549..b7995db1a6 100644 --- a/src/main/webapp/lab/patient_investigations_collected.xhtml +++ b/src/main/webapp/lab/patient_investigations_collected.xhtml @@ -154,6 +154,20 @@ > + + + + + Date: Fri, 26 Jul 2024 09:51:57 +0530 Subject: [PATCH 06/20] closses#6565 Signed-off-by: Lahiru Rasanjaya --- src/main/webapp/admin/staff/admin_doctor_speciality.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml index 1b1895d6fe..c73c27e04b 100644 --- a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml +++ b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml @@ -64,7 +64,7 @@ - + From 04dc76ed41d6110bbecf8ab9a2b5c471a07f8641 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Fri, 26 Jul 2024 09:52:04 +0530 Subject: [PATCH 07/20] Closes #6461 Signed-off-by: buddhika75 --- src/main/webapp/cashier/index.xhtml | 20 +++++++++---------- .../collecting_centre_search_bill_own.xhtml | 3 ++- .../ezcomp/ftm/ftmPaymentDetailCapture.xhtml | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/cashier/index.xhtml b/src/main/webapp/cashier/index.xhtml index 7db39be7e9..14fedd4d6a 100644 --- a/src/main/webapp/cashier/index.xhtml +++ b/src/main/webapp/cashier/index.xhtml @@ -10,10 +10,10 @@ - -
-
+
+
+
- -
-
- - -
+ +
+
+ +
- +
+ diff --git a/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml b/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml index 68cfb08016..ec969a78f8 100644 --- a/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml +++ b/src/main/webapp/collecting_centre/collecting_centre_search_bill_own.xhtml @@ -128,8 +128,9 @@ ajax="false" value="View Bill" action="#{billSearch.navigateToRefundCollectingCentreBill()}"> + - #{billController.findBillbyID(bill.id)} + diff --git a/src/main/webapp/resources/ezcomp/ftm/ftmPaymentDetailCapture.xhtml b/src/main/webapp/resources/ezcomp/ftm/ftmPaymentDetailCapture.xhtml index f7a11605cb..a5674a4931 100644 --- a/src/main/webapp/resources/ezcomp/ftm/ftmPaymentDetailCapture.xhtml +++ b/src/main/webapp/resources/ezcomp/ftm/ftmPaymentDetailCapture.xhtml @@ -56,7 +56,7 @@
- +
From 247ed7075d362180ed5ffee7b6147591c8ae3435 Mon Sep 17 00:00:00 2001 From: Lahiru Rasanjaya Date: Fri, 26 Jul 2024 11:04:37 +0530 Subject: [PATCH 08/20] Signed-off-by: Lahiru Rasanjaya --- .../divudi/bean/common/DoctorSpecialityController.java | 10 ++++++++++ .../java/com/divudi/bean/common/WebUserController.java | 2 +- .../webapp/admin/staff/admin_doctor_speciality.xhtml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java index 9c0edc1a8f..951ba7ef24 100644 --- a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java +++ b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java @@ -120,6 +120,16 @@ private void recreateModel() { } public void saveSelected() { + + if(getCurrent().getName() == null ){ + JsfUtil.addErrorMessage("Name is required"); + return; + } + + if(getCurrent().getDescription()== null){ + JsfUtil.addErrorMessage("Description is required"); + return; + } if (getCurrent().getId() != null && getCurrent().getId() > 0) { getFacade().edit(current); diff --git a/src/main/java/com/divudi/bean/common/WebUserController.java b/src/main/java/com/divudi/bean/common/WebUserController.java index d43b5ea021..0624f100f3 100644 --- a/src/main/java/com/divudi/bean/common/WebUserController.java +++ b/src/main/java/com/divudi/bean/common/WebUserController.java @@ -141,7 +141,7 @@ public class WebUserController implements Serializable { private LoginPage loginPage; - boolean grantAllPrivilegesToAllUsersForTesting = false; + boolean grantAllPrivilegesToAllUsersForTesting = true; private List userNotifications; private int userNotificationCount; diff --git a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml index c73c27e04b..c22575138a 100644 --- a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml +++ b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml @@ -62,7 +62,7 @@ - + From b72e8aa8fe094dfa4f536d37c709b5e834bd9431 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Fri, 26 Jul 2024 11:10:41 +0530 Subject: [PATCH 09/20] closes#6574 --- .../com/divudi/bean/common/EnumController.java | 16 ++++++++++++++++ src/main/resources/META-INF/persistence.xml | 4 ++-- .../ezcomp/common/patient_details.xhtml | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java index 1c586fb0e4..e2d6c4a424 100644 --- a/src/main/java/com/divudi/bean/common/EnumController.java +++ b/src/main/java/com/divudi/bean/common/EnumController.java @@ -72,6 +72,7 @@ public class EnumController implements Serializable { List paymentMethodsForOpdBilling; List paymentMethodsForChanneling; List paymentMethodsForPharmacyBilling; + private List paymentMethodsForPatientDeposit; SessionNumberType[] sessionNumberTypes; @PostConstruct @@ -790,4 +791,19 @@ public void setPaymentScheme(PaymentScheme paymentScheme) { this.paymentScheme = paymentScheme; } + public List getPaymentMethodsForPatientDeposit() { + paymentMethodsForPatientDeposit = new ArrayList<>(); + for (PaymentMethod pm : PaymentMethod.values()) { + boolean include = configOptionApplicationController.getBooleanValueByKey(pm.getLabel() + " is available for Patient Deposit", true); + if (include) { + paymentMethodsForPatientDeposit.add(pm); + } + } + return paymentMethodsForPatientDeposit; + } + + public void setPaymentMethodsForPatientDeposit(List paymentMethodsForPatientDeposit) { + this.paymentMethodsForPatientDeposit = paymentMethodsForPatientDeposit; + } + } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e7d5b37cc4..6d8623993e 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,14 +2,14 @@ - jdbc/demos + jdbc/arogya false - jdbc/demoaudit + jdbc/arogyaAudit false diff --git a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml index 5ab1f8485d..a7846d12fd 100644 --- a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml +++ b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml @@ -383,6 +383,12 @@ severity="#{cc.attrs.controller.patient.person.foreigner?'warning':'success'}" styleClass="mr-2"> + + + + + + From 19561f126de301bc4d3a57c8082dc15a1ac08b7c Mon Sep 17 00:00:00 2001 From: Lahiru Rasanjaya Date: Fri, 26 Jul 2024 11:25:18 +0530 Subject: [PATCH 10/20] Signed-off-by: Lahiru Rasanjaya --- 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 36252c3a7b..2774831016 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,14 +2,14 @@ - jdbc/ruhunuDemo + jdbc/hims false - jdbc/ruhunuDemoAudit + jdbc/himsaudit false From e0fcdc7989add7805fb189a49a8f29cdc0d0abbd Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Fri, 26 Jul 2024 13:27:46 +0530 Subject: [PATCH 11/20] closes#6575 Signed-off-by: DamithDeshan --- .../divudi/bean/common/PatientController.java | 36 +- src/main/webapp/opd/opd_bill.xhtml | 401 +++++++++++++++++- 2 files changed, 411 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/PatientController.java b/src/main/java/com/divudi/bean/common/PatientController.java index 0bbc96334e..1589ea7408 100644 --- a/src/main/java/com/divudi/bean/common/PatientController.java +++ b/src/main/java/com/divudi/bean/common/PatientController.java @@ -453,7 +453,7 @@ public void downloadAllPatients() { response.setContentType("application/vnd.ms-excel"); response.setHeader("Content-Disposition", "attachment; filename=Patients.xlsx"); - try ( ServletOutputStream outputStream = response.getOutputStream()) { + try (ServletOutputStream outputStream = response.getOutputStream()) { workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); @@ -571,7 +571,7 @@ public void downloadPatientsPhoneNumbers() { response.setContentType("application/vnd.ms-excel"); response.setHeader("Content-Disposition", "attachment; filename=PatientPhoneNumbers.xlsx"); - try ( ServletOutputStream outputStream = response.getOutputStream()) { + try (ServletOutputStream outputStream = response.getOutputStream()) { workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); @@ -1047,7 +1047,6 @@ public void createPatientInvestigationsTableAllByLoggedInstitution() { temMap.put("ins", getSessionController().getInstitution()); sql += " order by pi.approveAt desc "; - //System.err.println("Sql " + sql); // patientInvestigations = getPatientInvestigationFacade().findByJpql(sql, temMap, TemporalType.TIMESTAMP); // patientInvestigations= } @@ -1563,6 +1562,7 @@ public void quickSearchPatientLongPhoneNumber(ControllerWithPatient controller) Long searchedPhoneNumber = CommonFunctions.removeSpecialCharsInPhonenumber(quickSearchPhoneNumber); m.put("pp", searchedPhoneNumber); quickSearchPatientList = getFacade().findByJpql(j, m); + opdBillController.setPaymentMethod(null); if (quickSearchPatientList == null) { JsfUtil.addErrorMessage("No Patient found !"); controller.setPatient(null); @@ -1581,6 +1581,14 @@ public void quickSearchPatientLongPhoneNumber(ControllerWithPatient controller) patientSearched = quickSearchPatientList.get(0); controller.setPatient(patientSearched); controller.setPatientDetailsEditable(false); + opdBillController.setPaymentMethod(null); + if (controller.getPatient().getHasAnAccount() != null) { + if (patientSearched.getHasAnAccount() && configOptionApplicationController.getBooleanValueByKey("Automatically set the PatientDeposit payment Method if a Deposit is Available", false)) { + opdBillController.setPaymentMethod(PaymentMethod.PatientDeposit); + opdBillController.listnerForPaymentMethodChange(); + } + } + quickSearchPatientList = null; } else { controller.setPatient(null); @@ -1608,6 +1616,14 @@ public void selectQuickOneFromQuickSearchPatient(ControllerWithPatient controlle controller.setPatient(current); admissionController.fillCurrentPatientAllergies(current); controller.setPatientDetailsEditable(false); + opdBillController.setPaymentMethod(null); + if (controller.getPatient().getHasAnAccount() != null) { + if (controller.getPatient().getHasAnAccount() && configOptionApplicationController.getBooleanValueByKey("Automatically set the PatientDeposit payment Method if a Deposit is Available", false)) { + opdBillController.setPaymentMethod(PaymentMethod.PatientDeposit); + opdBillController.listnerForPaymentMethodChange(); + } + } + quickSearchPatientList = null; } @@ -2042,22 +2058,18 @@ public void createPatientBarcode() { // return str; } catch (Exception ex) { - // ////System.out.println("ex = " + ex.getMessage()); } } else { - // ////System.out.println("else = "); try { Barcode bc = BarcodeFactory.createCode128A("0000"); bc.setBarHeight(5); bc.setBarWidth(3); bc.setDrawingText(true); BarcodeImageHandler.saveJPEG(bc, barcodeFile); - // ////System.out.println("12"); InputStream targetStream = new FileInputStream(barcodeFile); StreamedContent str = DefaultStreamedContent.builder().contentType("image/jpeg").name(barcodeFile.getName()).stream(() -> targetStream).build(); barcode = str; } catch (Exception ex) { - // ////System.out.println("ex = " + ex.getMessage()); } } } @@ -2155,7 +2167,6 @@ public void dobChangeListen() { } public StreamedContent getPhoto(Patient p) { - //////System.out.println("p is " + p); FacesContext context = FacesContext.getCurrentInstance(); if (context.getRenderResponse()) { return new DefaultStreamedContent(); @@ -2163,7 +2174,6 @@ public StreamedContent getPhoto(Patient p) { return new DefaultStreamedContent(); } else { if (p.getId() != null && p.getBaImage() != null) { - //////System.out.println("giving image"); InputStream targetStream = new ByteArrayInputStream(p.getBaImage()); StreamedContent str = DefaultStreamedContent.builder().contentType(p.getFileType()).name(p.getFileName()).stream(() -> targetStream).build(); return str; @@ -2306,7 +2316,6 @@ public List completePatient(String query) { + " or (p.person.mobile) like :q " + " order by p.person.name"; hm.put("q", "%" + query.toUpperCase() + "%"); - //////System.out.println(sql); suggestions = getFacade().findByJpql(sql, hm, 20); } return suggestions; @@ -2782,11 +2791,6 @@ public String getCountPatientCode(String s) { String st = ""; if (p != null) { String str = p.getCode(); -// //System.out.println("str.substring(0,1) = " + str.substring(0, 1)); -// //System.out.println("str.substring(0,2) = " + str.substring(0, 2)); -// //System.out.println("str.substring(2) = " + str.substring(2)); -// //System.out.println("str.substring(3) = " + str.substring(3)); -// //System.out.println("str.substring(3,7) = " + str.substring(3, 7)); long l = Long.parseLong(str.substring(2)); l++; st += s; @@ -3691,13 +3695,11 @@ public Object getAsObject(FacesContext facesContext, UIComponent component, Stri } PatientController controller = (PatientController) facesContext.getApplication().getELResolver(). getValue(facesContext.getELContext(), null, "patientController"); - //////System.out.println("value at converter getAsObject is " + value); return controller.getEjbFacade().find(getKey(value)); } java.lang.Long getKey(String value) { java.lang.Long key; - //////System.out.println(value); if (value == null || value.equals("null") || value.trim().equals("")) { key = 0l; } else { diff --git a/src/main/webapp/opd/opd_bill.xhtml b/src/main/webapp/opd/opd_bill.xhtml index ee04ecb2d6..9eb1e7ce09 100644 --- a/src/main/webapp/opd/opd_bill.xhtml +++ b/src/main/webapp/opd/opd_bill.xhtml @@ -6,6 +6,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns="http://www.w3.org/1999/xhtml" xmlns:pa="http://xmlns.jcp.org/jsf/composite/paymentMethod" + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common"> @@ -56,12 +57,394 @@
-->
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{ps.person.name} + + + #{ps.person.phone} + + + #{ps.person.mobile} + + + + + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+
+ +
+
+ + + + +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ +
+
+ +
+
+ +
+ + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -72,7 +455,7 @@ id="lcNumber"/>
- + @@ -580,7 +963,7 @@
- + @@ -645,7 +1028,7 @@
- + From 355e560b9e3cb956b4dee867e8b9d5767e90256f Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Fri, 26 Jul 2024 14:34:53 +0530 Subject: [PATCH 12/20] closes#6617 --- .../java/com/divudi/bean/common/PatientController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/divudi/bean/common/PatientController.java b/src/main/java/com/divudi/bean/common/PatientController.java index 1589ea7408..a45cd81e03 100644 --- a/src/main/java/com/divudi/bean/common/PatientController.java +++ b/src/main/java/com/divudi/bean/common/PatientController.java @@ -914,6 +914,16 @@ public String navigateToReceiveDepositsFromPatientProfile() { JsfUtil.addErrorMessage("No patient selected"); return ""; } + + if(current.getHasAnAccount() == null){ + JsfUtil.addErrorMessage("Patient has No Account"); + return ""; + } + if(!current.getHasAnAccount()){ + JsfUtil.addErrorMessage("Patient has No Account"); + return ""; + } + paymentMethodData = new PaymentMethodData(); bill = new Bill(); billItem = new BillItem(); From 8a69c4806d0a5557e53f444faf1f1971479b0573 Mon Sep 17 00:00:00 2001 From: Lahiru Rasanjaya Date: Fri, 26 Jul 2024 15:36:56 +0530 Subject: [PATCH 13/20] closes #6565 Signed-off-by: Lahiru Rasanjaya --- .../divudi/bean/common/DoctorSpecialityController.java | 10 +++++----- .../webapp/admin/staff/admin_doctor_speciality.xhtml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java index 951ba7ef24..e0e213a74c 100644 --- a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java +++ b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java @@ -121,15 +121,15 @@ private void recreateModel() { public void saveSelected() { - if(getCurrent().getName() == null ){ + if(getCurrent().getName() == null || getCurrent().getName().isEmpty()){ JsfUtil.addErrorMessage("Name is required"); return; } - if(getCurrent().getDescription()== null){ - JsfUtil.addErrorMessage("Description is required"); - return; - } +// if(getCurrent().getDescription()== null || getCurrent().getDescription().isEmpty() ){ +// JsfUtil.addErrorMessage("Description is required"); +// return; +// } if (getCurrent().getId() != null && getCurrent().getId() > 0) { getFacade().edit(current); diff --git a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml index c22575138a..cf1ef883d0 100644 --- a/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml +++ b/src/main/webapp/admin/staff/admin_doctor_speciality.xhtml @@ -27,7 +27,7 @@ icon="fa-solid fa-plus" class="ui-button-success w-25" process="btnAdd" - update="gpDetail" > + update="gpDetail lstSelect" > - + From 90f6564899bd00858def4340bebd0bb5e2dc65bb Mon Sep 17 00:00:00 2001 From: Piyankara N W M G P Date: Fri, 26 Jul 2024 15:54:33 +0530 Subject: [PATCH 14/20] Signed-off-by: Piyankara N W M G P closes Issue#6365 --- .../webapp/payments/patient/receive.xhtml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/payments/patient/receive.xhtml b/src/main/webapp/payments/patient/receive.xhtml index c3b26d2571..35c7201141 100644 --- a/src/main/webapp/payments/patient/receive.xhtml +++ b/src/main/webapp/payments/patient/receive.xhtml @@ -51,30 +51,32 @@
- + - + + + + - - - - - + + + - + - + - +
+
From 52ab6de03691266ffb29c7892d25a86a74e7dbb0 Mon Sep 17 00:00:00 2001 From: Piyankara N W M G P Date: Fri, 26 Jul 2024 16:16:29 +0530 Subject: [PATCH 15/20] Signed-off-by: Piyankara N W M G P closes Issue#6365 --- .../webapp/payments/patient/receive.xhtml | 2 +- .../webapp/payments/staff_credit_settle.xhtml | 21 ++++++++++--------- .../resources/paymentMethod/cheque.xhtml | 4 ++-- .../resources/paymentMethod/creditCard.xhtml | 2 +- .../webapp/resources/paymentMethod/slip.xhtml | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/payments/patient/receive.xhtml b/src/main/webapp/payments/patient/receive.xhtml index 35c7201141..7dd0990cad 100644 --- a/src/main/webapp/payments/patient/receive.xhtml +++ b/src/main/webapp/payments/patient/receive.xhtml @@ -56,7 +56,7 @@ - + diff --git a/src/main/webapp/payments/staff_credit_settle.xhtml b/src/main/webapp/payments/staff_credit_settle.xhtml index 0754b0b9c5..1fb2558a54 100644 --- a/src/main/webapp/payments/staff_credit_settle.xhtml +++ b/src/main/webapp/payments/staff_credit_settle.xhtml @@ -51,27 +51,28 @@
- + - + + + + - - - - - + + + - + - + - +
diff --git a/src/main/webapp/resources/paymentMethod/cheque.xhtml b/src/main/webapp/resources/paymentMethod/cheque.xhtml index 913c6b7782..0a346f79cb 100644 --- a/src/main/webapp/resources/paymentMethod/cheque.xhtml +++ b/src/main/webapp/resources/paymentMethod/cheque.xhtml @@ -14,9 +14,9 @@ -
+
- + diff --git a/src/main/webapp/resources/paymentMethod/creditCard.xhtml b/src/main/webapp/resources/paymentMethod/creditCard.xhtml index 63bebe1de4..0328ca1510 100644 --- a/src/main/webapp/resources/paymentMethod/creditCard.xhtml +++ b/src/main/webapp/resources/paymentMethod/creditCard.xhtml @@ -14,7 +14,7 @@ -
+
diff --git a/src/main/webapp/resources/paymentMethod/slip.xhtml b/src/main/webapp/resources/paymentMethod/slip.xhtml index a4270cb708..b1907ddc52 100644 --- a/src/main/webapp/resources/paymentMethod/slip.xhtml +++ b/src/main/webapp/resources/paymentMethod/slip.xhtml @@ -14,7 +14,7 @@ -
+
From 509820c2f06d3ff860e4c2398e8901990e17d732 Mon Sep 17 00:00:00 2001 From: "H.K. Damith Deshan" <108138918+DamithDeshan@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:03:37 +0530 Subject: [PATCH 16/20] Update WebUserController.java --- src/main/java/com/divudi/bean/common/WebUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/common/WebUserController.java b/src/main/java/com/divudi/bean/common/WebUserController.java index 0624f100f3..d43b5ea021 100644 --- a/src/main/java/com/divudi/bean/common/WebUserController.java +++ b/src/main/java/com/divudi/bean/common/WebUserController.java @@ -141,7 +141,7 @@ public class WebUserController implements Serializable { private LoginPage loginPage; - boolean grantAllPrivilegesToAllUsersForTesting = true; + boolean grantAllPrivilegesToAllUsersForTesting = false; private List userNotifications; private int userNotificationCount; From 5dfc5beb0299a35b3ddfa7c4d59d91fdb2f00ab5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:41:25 +0000 Subject: [PATCH 17/20] Update version to 3.0.0.20240727.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 56a6051ca2..0cfbf08886 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -1 \ No newline at end of file +2 diff --git a/README.md b/README.md index fecaa2549d..72d058b5a7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio ## Current Version -Current Version: 3.0.0.20240727.1 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240727.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 46ddd0a2e0..c6108bbfca 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240727.1 \ No newline at end of file +3.0.0.20240727.2 From af05059d0749d3624b393dbb6183e1e46e003f9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:43:35 +0000 Subject: [PATCH 18/20] Update version to 3.0.0.20240727.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 d8263ee986..00750edc07 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -2 \ No newline at end of file +3 diff --git a/README.md b/README.md index 72d058b5a7..d5c326f338 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio ## Current Version -Current Version: 3.0.0.20240727.2 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240727.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 f230fa0f45..5b721392e3 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240727.2 \ No newline at end of file +3.0.0.20240727.3 From 2e9e35cc45f416935876b8014e4f2c6e49592314 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:46:01 +0000 Subject: [PATCH 19/20] Update version to 3.0.0.20240727.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 e440e5c842..b8626c4cff 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -3 \ No newline at end of file +4 diff --git a/README.md b/README.md index d5c326f338..d581e92021 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio ## Current Version -Current Version: 3.0.0.20240727.3 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240727.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 930000768c..39d28d0087 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240727.3 \ No newline at end of file +3.0.0.20240727.4 From eb93bbe2fe8906f15e987ab07c2530cce4cd8016 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:47:58 +0000 Subject: [PATCH 20/20] Update version to 3.0.0.20240727.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 d581e92021..606bd5702c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio ## Current Version -Current Version: 3.0.0.20240727.4 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240727.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 39d28d0087..76ecf600f2 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240727.4 +3.0.0.20240727.5