Merge pull request #6801 from hmislk/Issue#6494

Issue#6494 Closes #6494
hmislk · Aug 7, 2024 · 215f3ba · 215f3ba
2 parents 3ca651c + 6659402
commit 215f3ba
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 35 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-21
+21
diff --git a/src/main/java/com/divudi/bean/common/PatientController.java b/src/main/java/com/divudi/bean/common/PatientController.java
@@ -1121,7 +1121,7 @@ public String navigateToPatientDepositRefund() {
         createNewPatientDepositRefund();
         return "/payments/patient/send?faces-redirect=true;";
     }
-
+  
     public String navigateToPatientDepositRefundFromOPDBill(Patient patient) {
         current = patient;
         bill = new Bill();

diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -2475,11 +2475,6 @@ public void listPharmacyBills(BillType bt, Class bc) {
             m.put("dep", "%" + getSearchKeyword().getToDepartment().trim().toUpperCase() + "%");
         }
 
-        if (getSearchKeyword().getToDepartment() != null && !getSearchKeyword().getToDepartment().trim().equals("")) {
-            sql += " and  ((b.toDepartment.name) like :dep )";
-            m.put("dep", "%" + getSearchKeyword().getToDepartment().trim().toUpperCase() + "%");
-        }
-
         if (getSearchKeyword().getNetTotal() != null && !getSearchKeyword().getNetTotal().trim().equals("")) {
             sql += " and  ((b.netTotal) like :netTotal )";
             m.put("netTotal", "%" + getSearchKeyword().getNetTotal().trim().toUpperCase() + "%");

diff --git a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
@@ -628,7 +628,7 @@ public YearMonthDay getYearMonthDay() {
     public void setYearMonthDay(YearMonthDay yearMonthDay) {
         this.yearMonthDay = yearMonthDay;
     }
-  
+
     private List<Stock> stk;
 
     public void fillSelectStock() {

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -1,20 +1,21 @@
 <?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/arogya</jta-data-source>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-            <property name="eclipselink.logging.parameters" value="false"/>
-        </properties>
-    </persistence-unit>
-    <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-            <property name="eclipselink.logging.parameters" value="false"/>
-        </properties>
-    </persistence-unit>
-</persistence>
-
+  <persistence-unit name="hmisPU" transaction-type="JTA">
+    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+    <jta-data-source>jdbc/arogya</jta-data-source>
+    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+    <properties>
+      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+      <property name="eclipselink.logging.parameters" value="false"/>
+    </properties>
+  </persistence-unit>
+  <persistence-unit name="hmisAuditPU" transaction-type="JTA">
+    <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+    <class>com.divudi.entity.AuditEvent</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+      <property name="eclipselink.logging.parameters" value="false"/>
+    </properties>
+  </persistence-unit>
+</persistence>
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240807.21
+3.0.0.20240807.21
diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -835,7 +835,7 @@
                                      value="Unit Issue Margin" />
                     </p:submenu>
                     <p:submenu label="Purchase" rendered="#{webUserController.hasPrivilege('StorePurchase')}">
-                        <p:menuitem  ajax="false" action="/store/store_purhcase_order_request?faces-redirect=true"  value="Purchase Orders" rendered="#{webUserController.hasPrivilege('StorePurchaseOrder')}" ></p:menuitem>
+                        <p:menuitem  ajax="false" action="/store/store_purhcase_order_request?faces-redirect=true"  value="Purchase Orders" rendered="#{webUserController.hasPrivilege('StorePurchaseOrder')}" actionListener="#{storePurchaseOrderRequestController.recreate}"></p:menuitem>
                         <p:menuitem  ajax="false" action="/store/store_purhcase_order_list_to_approve?faces-redirect=true"  value="PO Approve" actionListener="#{searchController.makeListNull()}" rendered="#{webUserController.hasPrivilege('StorePurchaseOrderApproveSearch') or webUserController.hasPrivilege('StorePurchaseOrderApprove')}" ></p:menuitem>
                         <p:menuitem  ajax="false" action="/store/store_purchase_order_list_for_recieve?faces-redirect=true"  value="GRN Receive"  actionListener="#{searchController.makeListNull()}" rendered="#{webUserController.hasPrivilege('StorePurchaseGRNRecive')}" ></p:menuitem>                                        
                         <p:menuitem  ajax="false" action="/store/store_grn_list_for_return?faces-redirect=true"  value="GRN Return" actionListener="#{searchController.makeListNull()}" rendered="#{webUserController.hasPrivilege('StorePurchaseGRNReturn')}" ></p:menuitem>  

diff --git a/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml b/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml
@@ -25,11 +25,44 @@
                 <div class="row">
                     <div class="col-2">
                         <h:outputLabel value="From Date"/>
-                        <p:calendar id="fromDate" value="#{searchController.fromDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" class="w-100" inputStyleClass="w-100">      
+                        <p:calendar 
+                            id="fromDate" 
+                            value="#{searchController.fromDate}" 
+                            navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" 
+                            class="w-100" 
+                            inputStyleClass="w-100">      
                         </p:calendar>
                         <h:outputLabel value="To Date"/>
-                        <p:calendar id="toDate" value="#{searchController.toDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" class="w-100" inputStyleClass="w-100">                                                                              
+                        <p:calendar 
+                            id="toDate" 
+                            value="#{searchController.toDate}" 
+                            navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" 
+                            class="w-100" 
+                            inputStyleClass="w-100">                                                                              
                         </p:calendar>
+
+                        <p:commandButton 
+                            value="All Request" 
+                            action="#{searchController.createPoRequestedAndApprovedStore()}" 
+                            ajax="false" 
+                            icon="fa fa-search"
+                            class="w-100 ui-button-warning my-2">
+                        </p:commandButton>
+                        <p:commandButton 
+                            value="Approved Only" 
+                            action="#{searchController.createApprovedStore()}" 
+                            ajax="false"
+                            icon="fa fa-search"
+                            class="w-100 ui-button-warning">
+                        </p:commandButton>
+                        <p:commandButton 
+                            value="Not Approved" 
+                            action="#{searchController.createNotApprovedStore()}" 
+                            ajax="false" 
+                            icon="fa fa-search"
+                            class="w-100 ui-button-warning my-2">
+                        </p:commandButton>
+
                         <h:outputLabel value="Distributor"/>
                         <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.toInstitution}" class="w-100"/>
                         <h:outputLabel value="Requested User"/>
@@ -44,9 +77,7 @@
                         <p:inputText autocomplete="off" value="#{searchController.searchKeyword.netTotal}" class="w-100"/>
                         <h:outputLabel value="Max Result"/>
                         <p:inputText autocomplete="off" value="#{searchController.maxResult}" class="w-100"/>
-                        <p:commandButton value="All Request" action="#{searchController.createPoRequestedAndApprovedStore()}" ajax="false" class="w-100 ui-button-Warning my-2"></p:commandButton>
-                        <p:commandButton value="Approved Only" action="#{searchController.createApprovedStore()}" ajax="false" class="w-100 ui-button-Warning"></p:commandButton>
-                        <p:commandButton value="Not Approved" action="#{searchController.createNotApprovedStore()}" ajax="false" class="w-100 ui-button-Warning my-2"></p:commandButton>
+
                     </div>
                     <div class="col-10">
                         <p:dataTable id="tbl" value="#{searchController.bills}" var="b">
@@ -126,6 +157,7 @@
                                     icon="fas fa-edit"
                                     class="ui-button-warning"
                                     action="#{storePurchaseOrderRequestController.navigateToUpdatePurchaseOrder()}"
+                                    disabled="#{b.checkedBy ne null or b.referenceBill.creater ne null and b.referenceBill.cancelled eq false or b.cancelled eq true}"
                                     >
                                     <f:setPropertyActionListener target="#{storePurchaseOrderRequestController.currentBill}" value="#{b}"/>
                                 </p:commandButton>
@@ -135,11 +167,16 @@
                                     icon="fas fa-check-circle"
                                     class="ui-button-success mx-2"
                                     action="#{storePurchaseOrderController.navigateToPurchaseOrderApproval()}"
-                                    disabled="#{b.referenceBill.creater ne null or b.referenceBill.cancelled eq false or b.cancelled eq true or !webUserController.hasPrivilege('StorePurchaseOrderApprove')}">
+                                    disabled="#{b.checkedBy eq null or b.referenceBill.creater ne null or b.referenceBill.cancelled eq false or b.cancelled eq true or !webUserController.hasPrivilege('StorePurchaseOrderApprove')}">
                                     <f:setPropertyActionListener target="#{storePurchaseOrderController.requestedBill}" value="#{b}"/>
                                 </p:commandButton>
 
-                                <p:commandButton ajax="false" id="view" icon="fas fa-eye" action="store_reprint_po?faces-redirect=true" disabled="#{b.referenceBill.creater eq null or b.referenceBill.referenceBill eq null}">
+                                <p:commandButton 
+                                    ajax="false" 
+                                    id="view" 
+                                    icon="fas fa-eye" 
+                                    action="store_reprint_po?faces-redirect=true" 
+                                    disabled="#{b.referenceBill.creater eq null or b.referenceBill.referenceBill eq null}">
                                     <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{b.referenceBill}"/>
                                 </p:commandButton>
                                 <p:tooltip for="approve" value="Go to Approve the PO"  showDelay="0" hideDelay="0"></p:tooltip>