Skip to content

Commit 7ee12cf

Browse files
GSMgeethGSMgeeth
committed
Merge branch 'refs/heads/core-module-separation' into ruhunu-dev
2 parents 71f704e + b49fe6c commit 7ee12cf

15 files changed

+522
-553
lines changed

‎src/main/java/com/divudi/bean/common/CommonController.java

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ public void increment() {
4242
number++;
4343
}
4444

45+
public String convertToWordJSF(double number) {
46+
return CommonFunctions.convertToWord(number);
47+
}
48+
4549
public String formatToLongDate(Date date) {
4650
// Load the date format from session preferences
4751
String dateFormat = sessionController.getApplicationPreference().getLongDateFormat();
@@ -72,6 +76,10 @@ public boolean sameDate(Date date1, Date date2) {
7276
return CommonFunctions.sameDate(date1, date2);
7377
}
7478

79+
public Date getEndOfDay() {
80+
return CommonFunctions.getEndOfDay(new Date());
81+
}
82+
7583
public SessionInstance convertToSessionInstance(Object ob) {
7684
if (ob instanceof SessionInstance) {
7785
return (SessionInstance) ob;

‎src/main/java/com/divudi/bean/common/CommonFunctionsController.java

-39
This file was deleted.

‎src/main/webapp/cashier/handover_start_for_period.xhtml

+159-159
Large diffs are not rendered by default.

‎src/main/webapp/channel/channel_queue.xhtml

+20-20
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
size="6"
5858
showButtonBar="true"
5959
inputStyleClass="form-control"
60-
maxdate="#{commonFunctionsController.endOfDay}"
60+
maxdate="#{commonController.endOfDay}"
6161
pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
6262
</p:datePicker>
6363
<p:commandButton ajax="false"
@@ -75,24 +75,24 @@
7575

7676

7777
<!-- View Ongoing Session Data Button -->
78-
<p:commandButton ajax="false"
78+
<p:commandButton ajax="false"
7979
value="List Ongoing"
80-
icon="fa fa-sync-alt"
81-
styleClass="ui-button-info mx-1"
80+
icon="fa fa-sync-alt"
81+
styleClass="ui-button-info mx-1"
8282
action="#{bookingController.listTodaysOngoingSesionInstances()}" />
8383

8484
<!-- List Pending Button -->
85-
<p:commandButton ajax="false"
85+
<p:commandButton ajax="false"
8686
value="List Pending"
87-
icon="fa fa-hourglass-start"
88-
styleClass="ui-button-warning mx-1"
87+
icon="fa fa-hourglass-start"
88+
styleClass="ui-button-warning mx-1"
8989
action="#{bookingController.listTodaysPendingSesionInstances()}" />
9090

9191
<!-- List All Button -->
92-
<p:commandButton ajax="false"
92+
<p:commandButton ajax="false"
9393
value="List All"
94-
icon="fa fa-list"
95-
styleClass="ui-button-primary mx-1"
94+
icon="fa fa-list"
95+
styleClass="ui-button-primary mx-1"
9696
action="#{bookingController.listTodaysAllSesionInstances()}" />
9797

9898
<p:commandButton id="btnLogout" ajax="false" icon="pi pi-sign-out" action="#{sessionController.logout}" />
@@ -113,9 +113,9 @@
113113
</div>
114114

115115
<h:panelGroup id="tblSi">
116-
<ui:repeat var="s"
116+
<ui:repeat var="s"
117117
id="tblSessions"
118-
value="#{bookingController.sessionInstancesFiltered}"
118+
value="#{bookingController.sessionInstancesFiltered}"
119119
class="w-100 mt-5">
120120

121121
<div class="bgCard row w-100 p-2 shadow mt-1">
@@ -160,7 +160,7 @@
160160
</h:outputText>
161161
</span>
162162
:
163-
<span class="text-primary" style="font-size: 20pt;font-weight: bold">
163+
<span class="text-primary" style="font-size: 20pt;font-weight: bold">
164164
<h:outputText value="#{s.paidPatientCount}">
165165
<f:convertNumber pattern="#,##00"/>
166166
</h:outputText>
@@ -185,7 +185,7 @@
185185
</h:panelGrid>
186186
</span>
187187

188-
<span class="text-center">
188+
<span class="text-center">
189189
<h:panelGrid columns="1">
190190
<h:outputText style="font-size: 8pt;font-weight: bold" value="Booked"/>
191191
<h:outputText style="font-size: 20pt;font-weight: bold" value="#{s.bookedPatientCount}">
@@ -221,7 +221,7 @@
221221
</p:badge>
222222
</div>
223223

224-
<div>
224+
<div>
225225
<p:commandButton class="mx-2" icon="fas fa-eye"
226226
styleClass="rounded-button ui-button-outlined ui-button-info " ajax="false"
227227
value="View"
@@ -240,21 +240,21 @@
240240
<!-- <div class="card mt-1">
241241
<div class="card-body">
242242
<div class="row">
243-
243+
244244
<div class="col-2 bg-dark text-white">
245245
<div>
246246
</div>
247247
</div>
248248
<div class="col-4">
249249
<div class="d-flex justify-content-between align-items-center">
250-
250+
251251
<h:panelGroup class="mx-2">
252252
</h:panelGroup>
253253
</div>
254254
</div>
255255
</div>
256-
257-
256+
257+
258258
</div>
259259
</div>-->
260260
</ui:repeat>
@@ -292,4 +292,4 @@
292292
//]]>
293293
</script>
294294
</ui:define>
295-
</ui:composition>
295+
</ui:composition>

‎src/main/webapp/clinic/queue.xhtml

+20-20
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
size="6"
5858
showButtonBar="true"
5959
inputStyleClass="form-control"
60-
maxdate="#{commonFunctionsController.endOfDay}"
60+
maxdate="#{commonController.endOfDay}"
6161
pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
6262
</p:datePicker>
6363
<p:commandButton ajax="false"
@@ -75,24 +75,24 @@
7575

7676

7777
<!-- View Ongoing Session Data Button -->
78-
<p:commandButton ajax="false"
78+
<p:commandButton ajax="false"
7979
value="List Ongoing"
80-
icon="fa fa-sync-alt"
81-
styleClass="ui-button-info mx-1"
80+
icon="fa fa-sync-alt"
81+
styleClass="ui-button-info mx-1"
8282
action="#{bookingController.listTodaysOngoingSesionInstances()}" />
8383

8484
<!-- List Pending Button -->
85-
<p:commandButton ajax="false"
85+
<p:commandButton ajax="false"
8686
value="List Pending"
87-
icon="fa fa-hourglass-start"
88-
styleClass="ui-button-warning mx-1"
87+
icon="fa fa-hourglass-start"
88+
styleClass="ui-button-warning mx-1"
8989
action="#{bookingController.listTodaysPendingSesionInstances()}" />
9090

9191
<!-- List All Button -->
92-
<p:commandButton ajax="false"
92+
<p:commandButton ajax="false"
9393
value="List All"
94-
icon="fa fa-list"
95-
styleClass="ui-button-primary mx-1"
94+
icon="fa fa-list"
95+
styleClass="ui-button-primary mx-1"
9696
action="#{bookingController.listTodaysAllSesionInstances()}" />
9797

9898
<p:commandButton id="btnLogout" ajax="false" icon="pi pi-sign-out" action="#{sessionController.logout}" />
@@ -113,9 +113,9 @@
113113
</div>
114114

115115
<h:panelGroup id="tblSi">
116-
<ui:repeat var="s"
116+
<ui:repeat var="s"
117117
id="tblSessions"
118-
value="#{bookingController.sessionInstancesFiltered}"
118+
value="#{bookingController.sessionInstancesFiltered}"
119119
class="w-100 mt-5">
120120

121121
<div class="bgCard row w-100 p-2 shadow mt-1">
@@ -160,7 +160,7 @@
160160
</h:outputText>
161161
</span>
162162
:
163-
<span class="text-primary" style="font-size: 20pt;font-weight: bold">
163+
<span class="text-primary" style="font-size: 20pt;font-weight: bold">
164164
<h:outputText value="#{s.paidPatientCount}">
165165
<f:convertNumber pattern="#,##00"/>
166166
</h:outputText>
@@ -185,7 +185,7 @@
185185
</h:panelGrid>
186186
</span>
187187

188-
<span class="text-center">
188+
<span class="text-center">
189189
<h:panelGrid columns="1">
190190
<h:outputText style="font-size: 8pt;font-weight: bold" value="Booked"/>
191191
<h:outputText style="font-size: 20pt;font-weight: bold" value="#{s.bookedPatientCount}">
@@ -221,7 +221,7 @@
221221
</p:badge>
222222
</div>
223223

224-
<div>
224+
<div>
225225
<p:commandButton class="mx-2" icon="fas fa-eye"
226226
styleClass="rounded-button ui-button-outlined ui-button-info " ajax="false"
227227
value="View"
@@ -240,21 +240,21 @@
240240
<!-- <div class="card mt-1">
241241
<div class="card-body">
242242
<div class="row">
243-
243+
244244
<div class="col-2 bg-dark text-white">
245245
<div>
246246
</div>
247247
</div>
248248
<div class="col-4">
249249
<div class="d-flex justify-content-between align-items-center">
250-
250+
251251
<h:panelGroup class="mx-2">
252252
</h:panelGroup>
253253
</div>
254254
</div>
255255
</div>
256-
257-
256+
257+
258258
</div>
259259
</div>-->
260260
</ui:repeat>
@@ -292,4 +292,4 @@
292292
//]]>
293293
</script>
294294
</ui:define>
295-
</ui:composition>
295+
</ui:composition>

0 commit comments

Comments
 (0)