10555 consumption report bugfixes (#10610)

* consumption report issue 1 fix * consumption report issue 2 & 3 fix --------- Co-authored-by: imexh <[email protected]>
hmislk · Feb 18, 2025 · 2085dc4 · 2085dc4
1 parent 98e65c4
commit 2085dc4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyController.java
@@ -21,13 +21,7 @@
 import com.divudi.data.dataStructure.ItemTransactionSummeryRow;
 import com.divudi.data.dataStructure.StockAverage;
 
-import com.divudi.entity.Bill;
-import com.divudi.entity.BillItem;
-import com.divudi.entity.BilledBill;
-import com.divudi.entity.Category;
-import com.divudi.entity.Department;
-import com.divudi.entity.Institution;
-import com.divudi.entity.Item;
+import com.divudi.entity.*;
 import com.divudi.entity.pharmacy.Amp;
 import com.divudi.entity.pharmacy.Ampp;
 import com.divudi.entity.pharmacy.Atm;
@@ -972,6 +966,18 @@ public void generateGrnReportTable() {
         calculateTotals(bills);
     }
 
+    public static String formatDate(Date date) {
+        if (date == null) {
+            return "";
+        }
+
+        UserPreference userPreference = new UserPreference();
+        String pattern = userPreference.getLongDateTimeFormat();
+
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.format(date);
+    }
+
     public void createConsumptionReportTable() {
         resetFields();
 

diff --git a/src/main/webapp/reports/inventoryReports/consumption.xhtml b/src/main/webapp/reports/inventoryReports/consumption.xhtml
@@ -384,14 +384,14 @@
                                     width="6em"
                                     filterMatchMode="contains"
                                     sortBy="#{b.createdAt}"
-                                    filterBy="#{b.createdAt}">
+                                    filterBy="#{pharmacyController.formatDate(b.createdAt)}">
                                 <h:outputText value="#{b.createdAt}">
                                     <f:convertDateTime
                                             pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                 </h:outputText>
                             </p:column>
 
-                            <p:column headerText="Documnet Created By" width="10em">
+                            <p:column headerText="Document Created By" width="10em">
                                 <h:outputText value="#{b.creater.webUserPerson.name}"/>
                             </p:column>
 
@@ -509,7 +509,7 @@
                                     width="8em"
                                     filterMatchMode="contains"
                                     sortBy="#{i.bill.createdAt}"
-                                    filterBy="#{i.bill.createdAt}">
+                                    filterBy="#{pharmacyController.formatDate(i.bill.createdAt)}">
                                 <p:outputLabel value="#{i.bill.createdAt}">
                                     <f:convertDateTime
                                             pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>