Merge pull request #6628 from hmislk/Issue#6627

Issue#6627 Closes #6627
hmislk · Jul 27, 2024 · bff518d · bff518d
2 parents eb93bbe + e78d278
commit bff518d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
-
-        <jta-data-source>jdbc/hims</jta-data-source>
+        <jta-data-source>jdbc/sethma</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -11,7 +10,7 @@
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/himsaudit</jta-data-source>
+        <jta-data-source>jdbc/sethmaAudit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>

diff --git a/src/main/webapp/cashier/shift_end_summery_bill_of_selected_user.xhtml b/src/main/webapp/cashier/shift_end_summery_bill_of_selected_user.xhtml
@@ -402,7 +402,7 @@
                                     currentPageReportTemplate="{startRecord}-{endRecord} of {totalRecords} records"
                                     rowsPerPageTemplate="5,10,20,50,100">
 
-                                    <p:column headerText="Payment ID" rendered="false" filterBy="#{bp.id}" sortBy="#{bp.id}">
+                                    <p:column headerText="Payment ID" filterBy="#{bp.id}" sortBy="#{bp.id}">
                                         <p:inputText value="#{bp.id}" ></p:inputText>
                                     </p:column>
 
@@ -423,7 +423,7 @@
                                         <h:outputText value="#{bp.bill.toStaff.person.name}" ></h:outputText>
                                     </p:column>
 
-                                    <p:column headerText="Bill ID" rendered="false" filterBy="#{bp.bill.id}" sortBy="#{bp.bill.id}">
+                                    <p:column headerText="Bill ID" filterBy="#{bp.bill.id}" sortBy="#{bp.bill.id}">
                                         <p:inputText value="#{bp.bill.id}" ></p:inputText>
                                     </p:column>
 
@@ -442,6 +442,10 @@
                                     <p:column headerText="Bill Type Atomic Cash Type" rendered="false" filterBy="#{bp.bill.billTypeAtomic.billFinanceType}" sortBy="#{bp.bill.billTypeAtomic.billFinanceType}">
                                         <h:outputText value="#{bp.bill.billTypeAtomic.billFinanceType}" ></h:outputText>
                                     </p:column>
+
+                                    <p:column headerText="Doctor Name"  filterBy="#{bp.bill.staff.person.nameWithTitle}" sortBy="#{bp.bill.staff.person.nameWithTitle}">
+                                        <p:outputLabel value="#{bp.bill.staff.person.nameWithTitle}" ></p:outputLabel>
+                                    </p:column>
 
                                     <p:column headerText="Payment Method" rendered="false" filterBy="#{bp.bill.paymentMethod.label}" filterMatchMode="contains" sortBy="#{bp.bill.paymentMethod.label}">
                                         <h:outputText value="#{bp.bill.paymentMethod}" ></h:outputText>

diff --git a/src/main/webapp/opd/opd_bill_search.xhtml b/src/main/webapp/opd/opd_bill_search.xhtml
@@ -209,7 +209,7 @@
                                         width="15">
                                         <h:outputLabel value="#{bill.id}"/>
                                     </p:column>
-                                    <p:column headerText="Bill No" sortBy="#{bill.deptId}" filterBy="#{bill.deptId}" >                                
+                                    <p:column headerText="Bill No*" sortBy="#{bill.deptId}" filterBy="#{bill.deptId}" filterMatchMode="contains">                                
                                         <p:commandLink 
                                             id="billNo" 
                                             ajax="false" 
@@ -218,7 +218,9 @@
                                             <f:setPropertyActionListener value="#{bill}" target="#{billSearch.bill}"/>
                                         </p:commandLink>
                                     </p:column>
-                                    <p:column headerText="Batch Bill" sortBy="#{bill.backwardReferenceBill.insId}" filterBy="#{bill.backwardReferenceBill.insId}">
+                                    <p:column headerText="Batch Bill" sortBy="#{bill.backwardReferenceBill.insId}" 
+                                              filterMatchMode="contains"
+                                              filterBy="#{bill.backwardReferenceBill.insId}">
                                         <h:commandLink action="#{opdBillController.navigateToViewOpdBatchBill}" value="#{bill.backwardReferenceBill.insId}">
                                             <f:setPropertyActionListener value="#{bill}" target="#{opdBillController.bill}"/>
                                         </h:commandLink>  
@@ -266,16 +268,22 @@
                                         <h:outputLabel id="insDep" value="#{bill.toDepartment.name}" />
                                     </p:column>
 
-                                    <p:column headerText="Billed by"  sortBy="#{bill.creater.name}" filterBy="#{bill.creater.name}">
+                                    <p:column headerText="Billed by" 
+                                              sortBy="#{bill.creater.name}" 
+                                              filterMatchMode="contains"
+                                              filterBy="#{bill.creater.name}">
                                         <h:outputLabel value="#{bill.creater.webUserPerson.name}" ></h:outputLabel>
                                         <h:panelGroup rendered="#{bill.cancelled or bill.refunded}" style="display: grid">
                                             <h:outputLabel value="#{bill.cancelledBill.creater.webUserPerson.name}" style="color: red" rendered="#{bill.cancelled}"></h:outputLabel>
                                             <h:outputLabel value="#{bill.refundedBill.creater.webUserPerson.name}" style="color: orange" rendered="#{bill.refunded}"></h:outputLabel>
                                         </h:panelGroup>
                                     </p:column>   
 
-                                    <p:column headerText="Client"  sortBy="#{bill.patient.person.name}" 
-                                              filterBy="#{bill.patient.person.name}" >                               
+                                    <p:column 
+                                        headerText="Client"
+                                         filterMatchMode="contains"
+                                        sortBy="#{bill.patient.person.name}" 
+                                        filterBy="#{bill.patient.person.name}" >                               
                                         <h:panelGroup id="pt">
                                             <h:commandLink  value="#{bill.patient.person.name}" action="#{patientController.navigateToOpdPatientEditFromId()}" rendered="#{webUserController.hasPrivilege('OpdBillSearchEdit')}">
                                                 <f:setPropertyActionListener value="#{bill.patient}" target="#{patientController.current}"/>
@@ -318,7 +326,6 @@
                                                 </h:panelGroup>
                                             </h:panelGrid>
                                         </p:tooltip>
-
                                     </p:column>
 
                                     <p:column headerText="Gross Value" sortBy="#{bill.total}"