From 1c593dc191ede6d3b7fb3e454b542f4ebaf64e45 Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Fri, 19 Apr 2024 18:43:24 +0530 Subject: [PATCH 1/5] Signed-off-by: Lawan Samarasekara --- src/main/resources/version.txt | 2 +- src/main/webapp/channel/manage_booking.xhtml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt index 7b96805ab4..71672f89aa 100644 --- a/src/main/resources/version.txt +++ b/src/main/resources/version.txt @@ -1 +1 @@ -3.0.0.20240419.7 +3.0.0.20240419.8 diff --git a/src/main/webapp/channel/manage_booking.xhtml b/src/main/webapp/channel/manage_booking.xhtml index 51218a145e..6e26dd40db 100644 --- a/src/main/webapp/channel/manage_booking.xhtml +++ b/src/main/webapp/channel/manage_booking.xhtml @@ -660,14 +660,15 @@ - + - @@ -679,7 +680,7 @@ filteredValue="#{channelSearchController.filteredbillSessions}"> - + #{bs.bill.bookingId} @@ -687,7 +688,7 @@ - + #{bs.serviceSession.staff.speciality.name} From 199166ec3419255b48df0377426944aee45e41fb Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Fri, 19 Apr 2024 19:29:45 +0530 Subject: [PATCH 2/5] Signed-off-by: Lawan Samarasekara --- .../com/divudi/bean/channel/ChannelSearchController.java | 6 ++++-- src/main/webapp/channel/manage_booking.xhtml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/divudi/bean/channel/ChannelSearchController.java b/src/main/java/com/divudi/bean/channel/ChannelSearchController.java index 0710ba2bef..fd4e061ceb 100644 --- a/src/main/java/com/divudi/bean/channel/ChannelSearchController.java +++ b/src/main/java/com/divudi/bean/channel/ChannelSearchController.java @@ -122,8 +122,8 @@ public void setDate(Date date) { } public void searchForBillSessions() { - //// // System.out.println("getFromDate() = " + getFromDate()); - //// // System.out.println("getToDate() = " + getToDate()); + System.out.println("getFromDate() = " + getFromDate()); + System.out.println("getToDate() = " + getToDate()); //// // System.out.println("txtSearch = " + txtSearch); //// // System.out.println("txtSearchRef = " + txtSearchRef); if (getFromDate() == null && getToDate() == null @@ -179,10 +179,12 @@ public void searchForBillSessions() { m.put("class", BilledBill.class); if (getFromDate() != null && getToDate() != null) { + System.out.println("getBillSessionFacade().findByJpql(sql, m, TemporalType.TIMESTAMP) = " + getBillSessionFacade().findByJpql(sql, m, TemporalType.TIMESTAMP)); searchedBillSessions = getBillSessionFacade().findByJpql(sql, m, TemporalType.TIMESTAMP); } else { searchedBillSessions = getBillSessionFacade().findByJpql(sql, m); } + System.out.println("searchedBillSessions = " + searchedBillSessions); } diff --git a/src/main/webapp/channel/manage_booking.xhtml b/src/main/webapp/channel/manage_booking.xhtml index 6e26dd40db..979e93d502 100644 --- a/src/main/webapp/channel/manage_booking.xhtml +++ b/src/main/webapp/channel/manage_booking.xhtml @@ -669,7 +669,8 @@ From c68f4bbdba81d88cbd0de17ebe48b9ee7623eef0 Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Fri, 19 Apr 2024 19:30:09 +0530 Subject: [PATCH 3/5] Signed-off-by: Lawan Samarasekara --- .../java/com/divudi/bean/channel/ChannelSearchController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/divudi/bean/channel/ChannelSearchController.java b/src/main/java/com/divudi/bean/channel/ChannelSearchController.java index fd4e061ceb..cad7d671bb 100644 --- a/src/main/java/com/divudi/bean/channel/ChannelSearchController.java +++ b/src/main/java/com/divudi/bean/channel/ChannelSearchController.java @@ -122,8 +122,8 @@ public void setDate(Date date) { } public void searchForBillSessions() { - System.out.println("getFromDate() = " + getFromDate()); - System.out.println("getToDate() = " + getToDate()); + //System.out.println("getFromDate() = " + getFromDate()); + //System.out.println("getToDate() = " + getToDate()); //// // System.out.println("txtSearch = " + txtSearch); //// // System.out.println("txtSearchRef = " + txtSearchRef); if (getFromDate() == null && getToDate() == null From ef7e78dfb337df1e023f448b4c3f5ad3d0d1c24c Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Fri, 19 Apr 2024 22:25:10 +0530 Subject: [PATCH 4/5] Fixed #4660 Signed-off-by: Lawan Samarasekara --- src/main/webapp/channel/manage_booking.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/channel/manage_booking.xhtml b/src/main/webapp/channel/manage_booking.xhtml index 979e93d502..d799cae65c 100644 --- a/src/main/webapp/channel/manage_booking.xhtml +++ b/src/main/webapp/channel/manage_booking.xhtml @@ -655,7 +655,7 @@ - + From 82388eabdac67335ceee57d3a09bc672237b3ac1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 05:13:44 +0000 Subject: [PATCH 5/5] Update version to 3.0.0.20240420.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 3cb65966ed..f9d00aaf6b 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.20240420.2 (This line will be automatically updated to reflect the latest version) +Current Version: 3.0.0.20240420.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 cc1fbf6221..81cebf1674 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240420.2 +3.0.0.20240420.3