Merge branch 'master' into issue#4674

hmislk · Apr 20, 2024 · 0789a9a · 0789a9a
2 parents 073efa0 + 82388ea
commit 0789a9a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-2
+3
diff --git 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/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/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240420.2
+3.0.0.20240420.3
diff --git a/src/main/webapp/channel/manage_booking.xhtml b/src/main/webapp/channel/manage_booking.xhtml
@@ -655,20 +655,22 @@
                     </p:tab>
 
 
-                    <p:tab title="Search">
+                    <p:tab title="Search" rendered="false">
 
                         <p:calendar id="calFrom"  value="#{channelSearchController.fromDate}" pattern="dd MMMM yyyy" >   
                             <f:ajax event="dateSelect" execute="@this" render="bSessionSearch"/>
                         </p:calendar>
-                        <p:calendar id="calTo"  value="#{channelSearchController.toDate}" pattern="dd MMMM yyyy" >   
+                        <p:calendar class="mx-2" id="calTo"  value="#{channelSearchController.toDate}" pattern="dd MMMM yyyy" >
                             <f:ajax event="dateSelect" execute="@this" render="bSessionSearch"/>
                         </p:calendar>
 
                         <p:inputText id="txtBsSearch" value="#{channelSearchController.txtSearch}" placeholder="ID" >
                         </p:inputText>
 
-                        <p:commandButton id="btnBsSearch" 
-                                         value="Search" action="#{channelSearchController.searchForBillSessions}" 
+                        <p:commandButton id="btnBsSearch"
+                                         class="ui-button-warning mx-2" icon="fas fa-search"
+                                         value="Search" action="#{channelSearchController.searchForBillSessions}"
+                                         ajax="false"
                                          process="txtBsSearch calFrom calTo btnBsSearch" 
                                          update="bSessionSearch">
 
@@ -679,15 +681,15 @@
                                      filteredValue="#{channelSearchController.filteredbillSessions}">
 
 
-                            <p:column headerText="Booking Id" filterBy="#{bs.bill.bookingId}" filterMatchMode="contains">
+                            <p:column headerText="Booking ID" filterBy="#{bs.bill.bookingId}" filterMatchMode="contains">
                                 <h:commandLink action="channel_booking" actionListener="#{bookingController.resetToStartFromSpeciality}"> #{bs.bill.bookingId}
                                     <f:setPropertyActionListener target="#{bookingController.speciality}" value="#{bs.serviceSession.staff.speciality}"/>
                                     <f:setPropertyActionListener target="#{bookingController.staff}" value="#{bs.serviceSession.staff}"/>
                                     <f:setPropertyActionListener target="#{bookingController.selectedServiceSession}" value="#{bs.serviceSession}"/>
                                     <f:setPropertyActionListener target="#{bookingController.selectedBillSession}" value="#{bs}"/>
                                 </h:commandLink>
                             </p:column>
-                            <p:column headerText="Sepeciality" filterBy="#{bs.serviceSession.staff.speciality.name}" filterMatchMode="contains">
+                            <p:column headerText="Speciality" filterBy="#{bs.serviceSession.staff.speciality.name}" filterMatchMode="contains">
                                 <h:commandLink action="channel_booking" actionListener="#{bookingController.resetToStartFromSpeciality}">#{bs.serviceSession.staff.speciality.name}
                                     <f:setPropertyActionListener target="#{bookingController.speciality}" value="#{bs.serviceSession.staff.speciality}"/>
                                     <f:setPropertyActionListener target="#{bookingController.staff}" value="#{bs.serviceSession.staff}"/>