From 1eb04afe659edd07b568b635b0441c3fc159cf29 Mon Sep 17 00:00:00 2001
From: SandithP2001 <sandithpivithuru@gmail.com>
Date: Mon, 16 Dec 2024 17:38:20 +0530
Subject: [PATCH 1/5] Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com>

---
 src/main/resources/META-INF/persistence.xml            |  2 +-
 .../inventoryReports/closing_stock_report.xhtml        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 9c61bed59c..4ea5935dbf 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <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">
     <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-    <jta-data-source>jdbc/Ruhunu</jta-data-source>
+    <jta-data-source>jdbc/ruhunu</jta-data-source>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <properties>
       <property name="eclipselink.logging.level" value="WARNING"/>
diff --git a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
index b6c6c0b4bb..b97b87c7f3 100644
--- a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
+++ b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
@@ -105,6 +105,16 @@
                                 <p:outputLabel value="Department" for="phmDept" class="m-3">
                                 </p:outputLabel>
                             </h:panelGroup>
+                            <h:panelGroup id="phmDept">
+                                
+                                <!-- Component 1: Without Institution and Site -->
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site eq null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true">                                </p:selectOneMenu>
+                            </h:panelGroup>
                             <p:selectOneMenu 
                                 id="phmDept"
                                 class="w-100"

From 00f0ad0170b053566896af0c99aead437acd1f71 Mon Sep 17 00:00:00 2001
From: SandithP2001 <sandithpivithuru@gmail.com>
Date: Mon, 16 Dec 2024 17:42:45 +0530
Subject: [PATCH 2/5] Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com>

---
 .../closing_stock_report.xhtml                | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
index b97b87c7f3..036cbadbcc 100644
--- a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
+++ b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
@@ -106,14 +106,53 @@
                                 </p:outputLabel>
                             </h:panelGroup>
                             <h:panelGroup id="phmDept">
-                                
+
                                 <!-- Component 1: Without Institution and Site -->
                                 <p:selectOneMenu
                                     rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site eq null}"
                                     styleClass="w-100 form-control"
                                     value="#{pharmacyReportController.department}"
                                     filterMatchMode="contains"
-                                    filter="true">                                </p:selectOneMenu>
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}"
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+
+                                <!-- Component 2: With Site Only -->
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site ne null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+                                
+                                <!-- Component 3: With Institution Only --> 
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site ne null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+                                
+
                             </h:panelGroup>
                             <p:selectOneMenu 
                                 id="phmDept"
@@ -248,17 +287,17 @@
                                 <p:column headerText="Qty">
                                     <!--Item Batch Stock for Selected Department-->
                                     <h:outputText value="#{f.stockHistory.stockQty}"><f:convertNumber pattern="#,##0" /></h:outputText>
-                                    
+
                                     <!--Item Stock for Selected Department-->
                                     <h:outputText value="#{f.stockHistory.itemStock}"><f:convertNumber pattern="#,##0" /></h:outputText>
-                                    
+
                                     <!--Item Stock for Selected Institution-->
                                     <h:outputText value="#{f.stockHistory.institutionItemStock}"><f:convertNumber pattern="#,##0" /></h:outputText>
-                                    
+
                                     <!--Item Stock for All Institutions-->
                                     <h:outputText value="#{f.stockHistory.totalItemStock}"><f:convertNumber pattern="#,##0" /></h:outputText>
-                                    
-                                    
+
+
                                     <f:facet name="footer">
                                         <h:outputText value="#{pharmacyReportController.stockTotal}">
                                             <f:convertNumber pattern="#,##0" />

From 41017cb1628b31712bdcaaa62970e467d7ea74fe Mon Sep 17 00:00:00 2001
From: SandithP2001 <sandithpivithuru@gmail.com>
Date: Mon, 16 Dec 2024 17:45:35 +0530
Subject: [PATCH 3/5] Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com>

Institution Site Department filters done
---
 .../closing_stock_report.xhtml                | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
index 036cbadbcc..7cf01267ac 100644
--- a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
+++ b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
@@ -136,10 +136,10 @@
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
                                 </p:selectOneMenu>
-                                
+
                                 <!-- Component 3: With Institution Only --> 
                                 <p:selectOneMenu
-                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site ne null}"
+                                    rendered="#{pharmacyReportController.institution ne null and pharmacyReportController.site eq null}"
                                     styleClass="w-100 form-control"
                                     value="#{pharmacyReportController.department}"
                                     filterMatchMode="contains"
@@ -151,17 +151,21 @@
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
                                 </p:selectOneMenu>
-                                
 
-                            </h:panelGroup>
-                            <p:selectOneMenu 
-                                id="phmDept"
-                                class="w-100"
-                                value="#{pharmacyReportController.department}"
-                                filter="true">
-                                <f:selectItem itemLabel="All Departments" />
-                                <f:selectItems  value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution, pharmacyReportController.site)}" var="dept" itemLabel="#{dept.name}" itemValue="#{dept}" />
-                            </p:selectOneMenu>
+                                <!-- Component 4: With Both Institution and Site --> 
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution ne null and pharmacyReportController.site ne null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
 
 
 

From 0bcdfac65d1aea7c45b5c398d7280bb39896f735 Mon Sep 17 00:00:00 2001
From: SandithP2001 <sandithpivithuru@gmail.com>
Date: Mon, 16 Dec 2024 17:50:19 +0530
Subject: [PATCH 4/5] Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com>

---
 .../reports/inventoryReports/closing_stock_report.xhtml   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
index 7cf01267ac..3bbe33467d 100644
--- a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
+++ b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
@@ -131,7 +131,7 @@
                                     filter="true"> 
                                     <f:selectItem itemLabel="All Departments" />
                                     <f:selectItems  
-                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.site)}" 
                                         var="dept" 
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
@@ -146,7 +146,7 @@
                                     filter="true"> 
                                     <f:selectItem itemLabel="All Departments" />
                                     <f:selectItems  
-                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution)}" 
                                         var="dept" 
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
@@ -161,11 +161,13 @@
                                     filter="true"> 
                                     <f:selectItem itemLabel="All Departments" />
                                     <f:selectItems  
-                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}" 
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution, pharmacyReportController.site)}" 
                                         var="dept" 
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
                                 </p:selectOneMenu>
+                                
+                                </h:panelGroup>
 
 
 

From 7ca5e51da238d3a06b40a83e0937dbca0296851f Mon Sep 17 00:00:00 2001
From: SandithP2001 <sandithpivithuru@gmail.com>
Date: Mon, 16 Dec 2024 18:15:11 +0530
Subject: [PATCH 5/5] Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com>

closes #9658
---
 .../bean/report/PharmacyReportController.java |   6 +-
 .../closing_stock_report.xhtml                |   5 +-
 .../inventoryReports/stock_ledger.xhtml       | 152 ++++++++++++------
 3 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/divudi/bean/report/PharmacyReportController.java b/src/main/java/com/divudi/bean/report/PharmacyReportController.java
index 3847e2e9bf..91e1aff94f 100644
--- a/src/main/java/com/divudi/bean/report/PharmacyReportController.java
+++ b/src/main/java/com/divudi/bean/report/PharmacyReportController.java
@@ -1944,8 +1944,10 @@ public void processStockLedgerReport() {
             }
             jpql += ")";
         }
-        if (item != null) {
-            jpql += " and s.item=:itm ";
+        if (amp != null) {
+            item = amp;
+            System.out.println("item = " + item);
+            jpql += "and s.item=:itm ";
             m.put("itm", item);
         }
 
diff --git a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
index 3bbe33467d..e3ee8e24c0 100644
--- a/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
+++ b/src/main/webapp/reports/inventoryReports/closing_stock_report.xhtml
@@ -46,6 +46,7 @@
 
 
                             <p:spacer width="20"></p:spacer>  
+                            
                             <h:panelGroup layout="block" styleClass="form-group">
                                 <h:outputText styleClass="fa fa-boxes mr-2" />
                                 <p:outputLabel value="Report type" for="phmRepType" class="m-3">
@@ -166,8 +167,8 @@
                                         itemLabel="#{dept.name}" 
                                         itemValue="#{dept}" />
                                 </p:selectOneMenu>
-                                
-                                </h:panelGroup>
+
+                            </h:panelGroup>
 
 
 
diff --git a/src/main/webapp/reports/inventoryReports/stock_ledger.xhtml b/src/main/webapp/reports/inventoryReports/stock_ledger.xhtml
index 1944797a5b..f2d9ebe8be 100644
--- a/src/main/webapp/reports/inventoryReports/stock_ledger.xhtml
+++ b/src/main/webapp/reports/inventoryReports/stock_ledger.xhtml
@@ -47,8 +47,26 @@
                                 />
 
                             <p:spacer width="20"></p:spacer>  
-                            <p:spacer width="20"></p:spacer>  
-                            <p:spacer width="20"></p:spacer>  
+
+
+                            <h:panelGroup layout="block" styleClass="form-group">
+                                <h:outputText styleClass="fa fa-file-alt mr-2" />
+                                <p:outputLabel value="Document Type" for="phmDocType" class="m-3" >
+                                </p:outputLabel>
+                            </h:panelGroup>
+                            <p:selectOneMenu 
+                                id="phmDocType"
+                                value="#{pharmacyReportController.documentType}"
+                                class="w-100">
+                                <f:selectItem itemLabel="All Document Types"/>
+                                <f:selectItem itemLabel="OP Sale" itemValue="opSaleDoc"/>
+                                <f:selectItem itemLabel="IP Sale" itemValue="ipSaleDoc"/>
+                                <f:selectItem itemLabel="Transfer Issue" itemValue="transferIssueDoc"/>
+                                <f:selectItem itemLabel="Transfer Receive" itemValue="transferReceiveDoc"/>
+                                <f:selectItem itemLabel="Consumption" itemValue="consumptionDoc"/>
+                                <f:selectItem itemLabel="Purchase" itemValue="purchaseDoc"/>
+                                <f:selectItem itemLabel="GRN" itemValue="grnDoc"/>
+                            </p:selectOneMenu>
 
                             <h:panelGroup layout="block" styleClass="form-group">
                                 <h:outputText styleClass="fa fa-university mr-2" />
@@ -84,7 +102,7 @@
                             </p:selectOneMenu>
 
 
-
+                            <p:spacer width="20"></p:spacer>
 
 
                             <h:panelGroup layout="block" styleClass="form-group">
@@ -92,57 +110,87 @@
                                 <p:outputLabel value="Department" for="phmDept" class="m-3">
                                 </p:outputLabel>
                             </h:panelGroup>
-                            <p:selectOneMenu 
-                                id="phmDept"
-                                class="w-100"
-                                value="#{pharmacyReportController.department}"
-                                filter="true">
-                                <f:selectItem itemLabel="All Departments" />
-                                <f:selectItems  value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution, pharmacyReportController.site)}" var="dept" itemLabel="#{dept.name}" itemValue="#{dept}" />
-                            </p:selectOneMenu>
-
-
-                            <p:spacer width="20"></p:spacer>  
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-file-alt mr-2" />
-                                <p:outputLabel value="Document Type" for="phmDocType" class="m-3" >
-                                </p:outputLabel>
+                            <h:panelGroup id="phmDept">
+
+                                <!-- Component 1: Without Institution and Site -->
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site eq null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite()}"
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+
+                                <!-- Component 2: With Site Only -->
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution eq null and pharmacyReportController.site ne null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.site)}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+
+                                <!-- Component 3: With Institution Only --> 
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution ne null and pharmacyReportController.site eq null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution)}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
+
+                                <!-- Component 4: With Both Institution and Site --> 
+                                <p:selectOneMenu
+                                    rendered="#{pharmacyReportController.institution ne null and pharmacyReportController.site ne null}"
+                                    styleClass="w-100 form-control"
+                                    value="#{pharmacyReportController.department}"
+                                    filterMatchMode="contains"
+                                    filter="true"> 
+                                    <f:selectItem itemLabel="All Departments" />
+                                    <f:selectItems  
+                                        value="#{departmentController.getDepartmentsOfInstitutionAndSite(pharmacyReportController.institution, pharmacyReportController.site)}" 
+                                        var="dept" 
+                                        itemLabel="#{dept.name}" 
+                                        itemValue="#{dept}" />
+                                </p:selectOneMenu>
                             </h:panelGroup>
-                            <p:selectOneMenu 
-                                id="phmDocType"
-                                value="#{pharmacyReportController.documentType}"
-                                class="w-100">
-                                <f:selectItem itemLabel="All Document Types"/>
-                                <f:selectItem itemLabel="OP Sale" itemValue="opSaleDoc"/>
-                                <f:selectItem itemLabel="IP Sale" itemValue="ipSaleDoc"/>
-                                <f:selectItem itemLabel="Transfer Issue" itemValue="transferIssueDoc"/>
-                                <f:selectItem itemLabel="Transfer Receive" itemValue="transferReceiveDoc"/>
-                                <f:selectItem itemLabel="Consumption" itemValue="consumptionDoc"/>
-                                <f:selectItem itemLabel="Purchase" itemValue="purchaseDoc"/>
-                                <f:selectItem itemLabel="GRN" itemValue="grnDoc"/>
-                            </p:selectOneMenu>
-
-
-                            <p:spacer width="20"></p:spacer>   
-
 
+                            
                             <h:panelGroup layout="block" styleClass="form-group">
                                 <h:outputText styleClass="fa fa-box mr-2" />
-                                <p:outputLabel value="Item" for="phmItem" class="m-3" >
+                                <p:outputLabel value="Item Name" for="phmItem" class="m-3">
                                 </p:outputLabel>
                             </h:panelGroup>
-                            <p:selectOneMenu
+                            <p:autoComplete 
                                 id="phmItem"
+                                value="#{pharmacyReportController.amp}" 
+                                completeMethod="#{ampController.completeAmp}"
+                                var="item" 
                                 class="w-100"
-                                value="#{pharmacyReportController.item}"
-                                filter="true">
-                                <f:selectItem itemLabel="All Items" ></f:selectItem>
-                                <f:selectItems value="#{ampController.items}" var="item" itemLabel="#{item.name}" itemValue="#{item}" />
-                            </p:selectOneMenu>
-
+                                minQueryLength="3"
+                                maxResults="20"
+                                inputStyleClass="w-100"
+                                itemLabel="#{item.name}" 
+                                itemValue="#{item}" 
+                                ></p:autoComplete>
 
 
 
@@ -152,8 +200,14 @@
                         </h:panelGrid>
 
                         <div class="d-flex align-items-center mt-5">
-                            <p:commandButton class="ui-button-warning mx-1" icon="fas fa-cogs" ajax="false"  value="Process" action="#{pharmacyReportController.processStockLedgerReport()}" >
+                            <p:commandButton 
+                                class="ui-button-warning mx-1" 
+                                icon="fas fa-cogs" 
+                                ajax="false"  
+                                value="Process" 
+                                action="#{pharmacyReportController.processStockLedgerReport()}" >
                             </p:commandButton>
+                            
                             <p:commandButton class="ui-button- mx-1" icon="fas fa-print" ajax="false" value="Print All"><p:printer target="tbl" />
                             </p:commandButton>
                             <p:commandButton class="ui-button-success mx-1" icon="fas fa-file-excel" ajax="false" value="Download"><p:dataExporter type="xlsx" fileName="Stock Ledger Report" target="tbl"  />
@@ -172,7 +226,7 @@
                                      paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                      currentPageReportTemplate="Showing {startRecord} to {endRecord} of {totalRecords}" 
                                      rowsPerPageTemplate="5,10,15,25,50,100,500,1000">
-                            
+
 
                             <p:column headerText="S.No." width="5em">
                                 <h:outputText value="#{n+1}" />
@@ -258,7 +312,7 @@
                                 <h:outputText value="#{f.pbItem.billItem.bill.creater.name}" />
                             </p:column>
 
-                            
+
                         </p:dataTable>
 
                     </p:panel>