From c0884302183fa88302609e84da379b03451ab5df Mon Sep 17 00:00:00 2001
From: buddhika75 <buddhika.ari@gmail.com>
Date: Sat, 27 Jul 2024 17:31:33 +0530
Subject: [PATCH 1/3] Signed-off-by: buddhika75 <buddhika.ari@gmail.com>

---
 .../analytics/ReportTemplateController.java   | 138 ++++++++++++++
 .../com/divudi/data/ReportTemplateRow.java    |  14 ++
 .../divudi/data/ReportTemplateRowBundle.java  |  11 +-
 .../data/analytics/ReportTemplateType.java    |   1 +
 src/main/webapp/dataAdmin/report.xhtml        | 177 +++++++-----------
 5 files changed, 233 insertions(+), 108 deletions(-)

diff --git a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
index 4e2ba50f74..4babc16c0b 100644
--- a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
+++ b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
@@ -548,6 +548,23 @@ public ReportTemplateRowBundle generateReport(
                         paramStartId,
                         paramEndId);
                 break;
+            case SESSION_INSTANCE_LIST:
+                bundle = handleSessionInstanceList(
+                        btas,
+                        paramDate,
+                        paramFromDate,
+                        paramToDate,
+                        paramInstitution,
+                        paramDepartment,
+                        paramFromInstitution,
+                        paramFromDepartment,
+                        paramToInstitution,
+                        paramToDepartment,
+                        paramUser,
+                        paramCreditCompany,
+                        paramStartId,
+                        paramEndId);
+                break;
             default:
                 JsfUtil.addErrorMessage("Unknown Report Type");
                 return null;
@@ -2092,6 +2109,127 @@ private ReportTemplateRowBundle handleItemSummaryByBill(
         return bundle;
     }
 
+    private ReportTemplateRowBundle handleSessionInstanceList(
+            List<BillTypeAtomic> btas,
+            Date paramDate,
+            Date paramFromDate,
+            Date paramToDate,
+            Institution paramInstitution,
+            Department paramDepartment,
+            Institution paramFromInstitution,
+            Department paramFromDepartment,
+            Institution paramToInstitution,
+            Department paramToDepartment,
+            WebUser paramUser,
+            Institution paramCreditCompany,
+            Long paramStartId,
+            Long paramEndId) {
+
+        String jpql;
+        Map<String, Object> parameters = new HashMap<>();
+        ReportTemplateRowBundle bundle = new ReportTemplateRowBundle();
+
+        jpql = "select new com.divudi.data.ReportTemplateRow("
+                + " ss "
+                + " from SessionInstance ss "
+                + " where ss.retired<>:br ";
+        parameters.put("br", true);
+
+        if (paramDate != null) {
+            jpql += " and ss.startedAt=:bd";
+            parameters.put("bd", paramDate);
+        }
+
+        if (paramToDate != null) {
+            jpql += " and ss.startedAt < :td";
+            parameters.put("td", paramToDate);
+        }
+
+        if (paramFromDate != null) {
+            jpql += " and ss.startedAt > :fd";
+            parameters.put("fd", paramFromDate);
+        }
+
+        if (paramInstitution != null) {
+            jpql += " and ss.institution=:ins";
+            parameters.put("ins", paramInstitution);
+        }
+
+        if (paramDepartment != null) {
+            jpql += " and ss.department=:dep";
+            parameters.put("dep", paramDepartment);
+        }
+
+        if (paramUser != null) {
+            jpql += " and ss.creater=:wu";
+            parameters.put("wu", paramUser);
+        }
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("parameters = " + parameters);
+
+        List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.DATE);
+
+        if (rs == null || rs.isEmpty()) {
+            System.out.println("No results found.");
+            return null;
+        } else {
+            System.out.println("Results found: " + rs.size());
+        }
+
+        
+        long idCounter = 1;
+
+        for (ReportTemplateRow row : rs) {
+            row.setId(idCounter++);
+            if (row.getBtas() == null) {
+                row.setBtas(btas);
+            }
+            if (row.getDate() == null) {
+                row.setDate(paramDate);
+            }
+            if (row.getFromDate() == null) {
+                row.setFromDate(paramFromDate);
+            }
+            if (row.getToDate() == null) {
+                row.setToDate(paramToDate);
+            }
+            if (row.getInstitution() == null) {
+                row.setInstitution(paramInstitution);
+            }
+            if (row.getDepartment() == null) {
+                row.setDepartment(paramDepartment);
+            }
+            if (row.getFromInstitution() == null) {
+                row.setFromInstitution(paramFromInstitution);
+            }
+            if (row.getFromDepartment() == null) {
+                row.setFromDepartment(paramFromDepartment);
+            }
+            if (row.getToInstitution() == null) {
+                row.setToInstitution(paramToInstitution);
+            }
+            if (row.getToDepartment() == null) {
+                row.setToDepartment(paramToDepartment);
+            }
+            if (row.getUser() == null) {
+                row.setUser(paramUser);
+            }
+            if (row.getCreditCompany() == null) {
+                row.setCreditCompany(paramCreditCompany);
+            }
+            if (row.getStartId() == null) {
+                row.setStartId(paramStartId);
+            }
+            if (row.getEndId() == null) {
+                row.setEndId(paramEndId);
+            }
+        }
+
+        bundle.setReportTemplateRows(rs);
+        return bundle;
+    }
+
     private ReportTemplateRowBundle handleToDepartmentSummaryByBillFee(
             List<BillTypeAtomic> btas,
             Date paramDate,
diff --git a/src/main/java/com/divudi/data/ReportTemplateRow.java b/src/main/java/com/divudi/data/ReportTemplateRow.java
index fef99715fb..95eb52d33f 100644
--- a/src/main/java/com/divudi/data/ReportTemplateRow.java
+++ b/src/main/java/com/divudi/data/ReportTemplateRow.java
@@ -5,6 +5,7 @@
 import com.divudi.entity.Institution;
 import com.divudi.entity.Item;
 import com.divudi.entity.WebUser;
+import com.divudi.entity.channel.SessionInstance;
 import java.util.Date;
 import java.util.List;
 
@@ -48,8 +49,13 @@ public class ReportTemplateRow {
     private WebUser user;
     private Long startId;
     private Long endId;
+    private SessionInstance sessionInstance;
     
     private List<BillTypeAtomic> btas;
+
+    public ReportTemplateRow(SessionInstance sessionInstance) {
+        this.sessionInstance = sessionInstance;
+    }
     
     
 
@@ -397,4 +403,12 @@ public void setBtas(List<BillTypeAtomic> btas) {
         this.btas = btas;
     }
 
+    public SessionInstance getSessionInstance() {
+        return sessionInstance;
+    }
+
+    public void setSessionInstance(SessionInstance sessionInstance) {
+        this.sessionInstance = sessionInstance;
+    }
+
 }
diff --git a/src/main/java/com/divudi/data/ReportTemplateRowBundle.java b/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
index 109fb84e78..68c50855ef 100644
--- a/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
+++ b/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
@@ -1,6 +1,7 @@
 package com.divudi.data;
 
 import com.divudi.entity.ReportTemplate;
+import com.divudi.entity.channel.SessionInstance;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,7 +21,7 @@ public class ReportTemplateRowBundle {
     private Long count;
     private String name;
     private String description;
-
+    private SessionInstance sessionInstance;
     
     
     
@@ -108,6 +109,14 @@ public void setDescription(String description) {
         this.description = description;
     }
 
+    public SessionInstance getSessionInstance() {
+        return sessionInstance;
+    }
+
+    public void setSessionInstance(SessionInstance sessionInstance) {
+        this.sessionInstance = sessionInstance;
+    }
+
    
     
     
diff --git a/src/main/java/com/divudi/data/analytics/ReportTemplateType.java b/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
index f430f28f64..2c41b0ec59 100644
--- a/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
+++ b/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
@@ -10,6 +10,7 @@ public enum ReportTemplateType {
     BILL_ITEM_LIST("Bill Item List"),
     BILL_FEE_LIST("Bill Fee List"),
     PATIENT_LIST("Patient List"),
+    SESSION_INSTANCE_LIST("Channelling Session Instance List"),
     ENCOUNTER_LIST("Encounter List"),
     BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY("Bill fees grouped by to departmetnt and category"),
     BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS("Bill Type Summary by using Bills"),
diff --git a/src/main/webapp/dataAdmin/report.xhtml b/src/main/webapp/dataAdmin/report.xhtml
index d4fb765bdd..610cd83787 100644
--- a/src/main/webapp/dataAdmin/report.xhtml
+++ b/src/main/webapp/dataAdmin/report.xhtml
@@ -13,154 +13,117 @@
                 <h:form id="reportForm">
                     <p:messages id="messages" showDetail="true" closable="true" />
 
+                    <p:panelGrid columns="2" >
+                        <p:outputLabel value="Report : " />
+                        <p:outputLabel value="#{reportTemplateController.current.name}" />
+                        <p:outputLabel value="Report Type:"  />
+                        <p:selectOneMenu  value="#{reportTemplateController.current.reportTemplateType}"
+                                          filter="true"
+                                          filterMatchMode="contains"
+                                          class="w-100">
+                            <f:selectItems value="#{reportTemplateController.reportTemplateTypes}" var="type"
+                                           itemLabel="#{type}" itemValue="#{type}" />
+                        </p:selectOneMenu>
+                    </p:panelGrid>
+
                     <p:panelGrid columns="1" class="w-100 m-2 p-2">
                         <f:facet name="header">
                             <p:outputLabel value="Report" />
                             <p:commandButton class="mx-5" value="Process" ajax="false" action="#{reportTemplateController.processReport()}" />
                         </f:facet>
-                        
                         <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('DATE')}" >
-                            <p:outputLabel value="Name:" for="name" />
-                            <p:calendar id="calDate" value="#{reportTemplateController.date}" required="true"  class="w-100"/>
-                        </h:panelGroup>
-                        
-                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('FROM_DATE')}" >
-                            <p:outputLabel value="Name:" for="name" />
-                            <p:calendar id="calFromDate" value="#{reportTemplateController.fromDate}" required="true"  class="w-100"/>
+                            <p:outputLabel value="Date"  />
+                            <p:calendar  value="#{reportTemplateController.date}" required="true"  class="w-100"/>
                         </h:panelGroup>
-                        
-                         <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('TO_DATE')}" >
-                            <p:outputLabel value="Name:" for="name" />
-                            <p:calendar id="calFromDate" value="#{reportTemplateController.toDate}" required="true"  class="w-100"/>
-                        </h:panelGroup>                       
-                       
-                        <p:dataTable value="#{reportTemplateController.reportTemplateRows}" var="rtr" rowKey="" >
-                        
-                        </p:dataTable>
-                                 
-                    </p:panelGrid>
-
-                        <h:panelGroup >
-                            <h1>
-                                <p:outputLabel value="Report : " />
-                                <p:outputLabel value="#{reportTemplateController.current.name}" />
-                            </h1>
-                        </h:panelGroup>
-
-                        <h:panelGroup >
-                            <h1>
-                                <p:outputLabel value="Report : " />
-                                <p:outputLabel value="#{reportTemplateController.current.name}" />
-                            </h1>
-                        </h:panelGroup>
-
-                        <h:panelGroup >
 
-                            <p:outputLabel value="Report Type:"  />
-                            <p:selectOneMenu  value="#{reportTemplateController.current.reportTemplateType}"
-                                              filter="true"
-                                              filterMatchMode="contains"
-                                              class="w-100">
-                                <f:selectItems value="#{reportTemplateController.reportTemplateTypes}" var="type"
-                                               itemLabel="#{type}" itemValue="#{type}" />
-                            </p:selectOneMenu>
-                        </h:panelGroup>
-
-
-
-
-                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('DATE')}">
-                            <p:outputLabel value="Date:"  />
-                            <p:calendar id="calDate" value="#{reportTemplateController.date}" required="true" class="w-100"/>
-                        </h:panelGroup>
-
-                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('FROM_DATE')}">
-                            <p:outputLabel value="From Date"  />
-                            <p:calendar id="calFromDate" value="#{reportTemplateController.fromDate}" required="true" class="w-100"/>
-                        </h:panelGroup>
-
-                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('TO_DATE')}">
-                            <p:outputLabel value="To Date"  />
-                            <p:calendar id="calToDate" value="#{reportTemplateController.toDate}" required="true" class="w-100"/>
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('FROM_DATE')}" >
+                            <p:outputLabel value="From"  />
+                            <p:calendar  value="#{reportTemplateController.fromDate}" required="true"  class="w-100"/>
                         </h:panelGroup>
 
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('TO_DATE')}" >
+                            <p:outputLabel value="To"  />
+                            <p:calendar  value="#{reportTemplateController.toDate}" required="true"  class="w-100"/>
+                        </h:panelGroup>                       
                         <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('CREDIT_COMPANY')}">
                             <p:outputLabel value="Credit Company"  />
-                            <p:autoComplete class="w-75 mx-2" id="agent2" forceSelection="true"
+                            <p:autoComplete class="w-75 mx-2"  forceSelection="true"
                                             value="#{reportTemplateController.creditCompany}" completeMethod="#{agencyController.completeAgency}" var="ix"
                                             itemLabel="#{ix.name}" itemValue="#{ix}" size="38">
                             </p:autoComplete>
                         </h:panelGroup>
-
                         <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('CREDIT_COMPANY')}">
                             <p:outputLabel value="Credit Company"  />
-                            <p:autoComplete class="w-75 mx-2" id="agent2" forceSelection="true"
+                            <p:autoComplete class="w-75 mx-2"  forceSelection="true"
                                             value="#{reportTemplateController.creditCompany}" completeMethod="#{agencyController.completeAgency}" var="ix"
                                             itemLabel="#{ix.name}" itemValue="#{ix}" size="38">
                             </p:autoComplete>
                         </h:panelGroup>
+                    </p:panelGrid>
 
 
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
-                            <ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department 
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
 
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
 
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
+                        <ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department 
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
-                            <ez:report_item_cateroy_value
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
 
-                    </p:panelGrid>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
 
-                </h:form>
 
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
+                        <ez:report_item_cateroy_value
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
-                            <ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department 
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
+                        <ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department 
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
 
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
-                            <ez:report_bill_fee_grouped_by_atomic_bill_type
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                        <ez:report_bill_fee_grouped_by_atomic_bill_type
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
 
 
-                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
-                            <ez:report_item_cateroy_value
-                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
-                        </h:panelGroup>
+                    <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
+                        <ez:report_item_cateroy_value
+                            bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                    </h:panelGroup>
+
 
-                    </p:panelGrid>
 
                 </h:form>
 
+
+
+
+
             </ui:define>
         </ui:composition>
     </h:body>

From 2ab8b59becfb218725e685e6b0b1f3e019082427 Mon Sep 17 00:00:00 2001
From: Lahiru Rasanjaya <phlrasanjaya@gmail.com>
Date: Sat, 27 Jul 2024 18:57:26 +0530
Subject: [PATCH 2/3] closes Issue#6624 Signed-off-by: Lahiru Rasanjaya
 <phlrasanjaya@gmail.com>

---
 nb-configuration.xml                          |   2 +
 .../divudi/bean/report/ReportController.java  |  41 ++--
 src/main/resources/META-INF/persistence.xml   |   4 +-
 .../dynamic_report_summary.xhtml              | 218 ++++++++++++++++++
 .../dynamic_reports/dynamic_reports.xhtml     |  47 ++++
 src/main/webapp/resources/ezcomp/menu.xhtml   |   4 +-
 6 files changed, 292 insertions(+), 24 deletions(-)
 create mode 100644 src/main/webapp/reports/dynamic_reports/dynamic_report_summary.xhtml
 create mode 100644 src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml

diff --git a/nb-configuration.xml b/nb-configuration.xml
index 535eada8f3..5315dde908 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -16,5 +16,7 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
     </properties>
 </project-shared-configuration>
diff --git a/src/main/java/com/divudi/bean/report/ReportController.java b/src/main/java/com/divudi/bean/report/ReportController.java
index bd653f69e2..ca35470090 100644
--- a/src/main/java/com/divudi/bean/report/ReportController.java
+++ b/src/main/java/com/divudi/bean/report/ReportController.java
@@ -159,10 +159,10 @@ public void processCollectionCenterBalance() {
         collectionCenters = institutionFacade.findByJpql(jpql, m);
     }
 
-    public String navigatetoOPDLabReportByMenu(){
+    public String navigatetoOPDLabReportByMenu() {
         return "/lab/report_for_opd_print?faces-redirect=true";
     }
-    
+
     public String navigateToPrescriptionSummaryReport() {
         return "/pharmacy/prescription_summary_report?faces-redirect=true";
     }
@@ -312,19 +312,19 @@ public void processLabTestCount() {
         // Convert the map values to a list to be used in the JSF page
         reportList = new ArrayList<>(categoryReports.values());
     }
-    
-    public void filterOpdServiceCountBySelectedService(Long selectedItemId){
+
+    public void filterOpdServiceCountBySelectedService(Long selectedItemId) {
         if (selectedItemId != null) {
-            item=itemController.findItem(selectedItemId);
-            doctor=null;
+            item = itemController.findItem(selectedItemId);
+            doctor = null;
         }
         processOpdServiceCountDoctorWise();
     }
-    
-    public void filterOpdServiceCountBySelectedDoctor(Long selectedDoctorId){
+
+    public void filterOpdServiceCountBySelectedDoctor(Long selectedDoctorId) {
         if (selectedDoctorId != null) {
-            doctor=doctorController.findDoctor(selectedDoctorId);
-            item=null;
+            doctor = doctorController.findDoctor(selectedDoctorId);
+            item = null;
         }
         processOpdServiceCountDoctorWise();
     }
@@ -332,7 +332,7 @@ public void filterOpdServiceCountBySelectedDoctor(Long selectedDoctorId){
     public void processOpdServiceCountDoctorWise() {
         List<BillTypeAtomic> billtypes = new ArrayList<>();
         billtypes.add(BillTypeAtomic.OPD_BILL_TO_COLLECT_PAYMENT_AT_CASHIER);
-        
+
         String jpql = "select new com.divudi.data.ItemCount(bi.bill.fromStaff.person.name, bi.bill.fromStaff.id, bi.item.name, bi.item.id, count(bi)) "
                 + " from BillItem bi "
                 + " where bi.bill.cancelled=:can "
@@ -352,18 +352,16 @@ public void processOpdServiceCountDoctorWise() {
             jpql += " and bi.bill.fromStaff =:fs";
             m.put("fs", doctor);
         }
-        if(item != null){
+        if (item != null) {
             jpql += " and bi.item =:it";
             m.put("it", item);
         }
-        
+
         jpql += " group by bi.item, bi.bill.fromStaff ";
         jpql += " order by bi.bill.fromStaff.person.name, bi.item.name";
         reportOpdServiceCount = (List<ItemCount>) billItemFacade.findLightsByJpql(jpql, m);
     }
 
-    
-    
     public void processCollectingCentreReportsToPrint() {
         String jpql = "select bi "
                 + " from BillItem bi "
@@ -425,9 +423,6 @@ public void processCollectingCentreReportsToPrint() {
         billItems = billItemFacade.findByJpql(jpql, m);
     }
 
-    
-    
-    
     public void processCollectingCentreStatementReport() {
         String jpql = "select bi "
                 + " from BillItem bi "
@@ -817,7 +812,7 @@ public void downloadLabTestCount() {
         response.setContentType("application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment; filename=test_counts.xlsx");
 
-        try ( ServletOutputStream outputStream = response.getOutputStream()) {
+        try (ServletOutputStream outputStream = response.getOutputStream()) {
             workbook.write(outputStream);
             fc.responseComplete();
         } catch (IOException e) {
@@ -833,7 +828,7 @@ public void downloadPharmacySaleItemCount() {
         response.setContentType("application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment; filename=Sale_Item_Count.xlsx");
 
-        try ( ServletOutputStream outputStream = response.getOutputStream()) {
+        try (ServletOutputStream outputStream = response.getOutputStream()) {
             workbook.write(outputStream);
             fc.responseComplete();
         } catch (IOException e) {
@@ -849,7 +844,7 @@ public void downloadOpdServiceCount() {
         response.setContentType("application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment; filename=service_count.xlsx");
 
-        try ( ServletOutputStream outputStream = response.getOutputStream()) {
+        try (ServletOutputStream outputStream = response.getOutputStream()) {
             workbook.write(outputStream);
             fc.responseComplete();
         } catch (IOException e) {
@@ -1789,4 +1784,8 @@ public void setReportOpdServiceCount(List<ItemCount> reportOpdServiceCount) {
         this.reportOpdServiceCount = reportOpdServiceCount;
     }
 
+    public String navigateToDynamicReportSummary() {
+        return "/reports/dynamic_reports/dynamic_report_summary?faces-redirect=true";
+    }
+
 }
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 19c35b09ad..3d587e1744 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,7 +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/arogya</jta-data-source>
+        <jta-data-source>jdbc/hims</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -10,7 +10,7 @@
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+        <jta-data-source>jdbc/himsaudit</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/reports/dynamic_reports/dynamic_report_summary.xhtml b/src/main/webapp/reports/dynamic_reports/dynamic_report_summary.xhtml
new file mode 100644
index 0000000000..44886962ef
--- /dev/null
+++ b/src/main/webapp/reports/dynamic_reports/dynamic_report_summary.xhtml
@@ -0,0 +1,218 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <body>
+
+        <ui:composition template="/reports/dynamic_reports/dynamic_reports.xhtml">
+
+            <ui:define name="subcontent">
+                <h:form>
+                    <p:panel>
+                        <f:facet name="header" >
+                            <h:outputLabel value="All Financial Transaction Summary"/>                          
+                        </f:facet>
+                        <h:panelGrid columns="2" class="my-2" >
+                            <h:outputLabel value="From Date"/>
+                            <p:datePicker 
+                                class="w-100 mx-4" 
+                                inputStyleClass="w-100"
+                                id="fromDate" 
+                                value="#{searchController.fromDate}" 
+                                showTime="true"
+                                pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  >      
+                            </p:datePicker>
+                            <h:outputLabel value="To Date"/>
+                            <p:datePicker 
+                                class="w-100 mx-4" 
+                                inputStyleClass="w-100" 
+                                id="toDate" 
+                                value="#{searchController.toDate}" 
+                                showTime="true"
+                                pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  >                                                                              
+                            </p:datePicker>
+                            <h:outputText value="Institution" />
+                            <p:autoComplete 
+                                forceSelection="true"
+                                value="#{searchController.institution}"
+                                placeholder="Select Institution"
+                                completeMethod="#{institutionController.completeIns}" 
+                                id="ins2"
+                                var="ix" 
+                                itemLabel="#{ix.name}" 
+                                itemValue="#{ix}"
+                                class="w-100 mx-4"
+                                inputStyleClass="w-100"
+                                >
+                                <p:ajax event="blur" listener="#{searchController.fillInstitutionInDepartment(searchController.institution)}" process="ins2" update="depts" />
+                            </p:autoComplete>
+
+                            <h:outputText value="Department" />
+                            <p:selectOneMenu 
+                                id="depts" 
+                                filter="true"
+                                value="#{searchController.department}" 
+                                class="w-100 mx-4" 
+                                >
+                                <f:selectItem  itemLabel="Please select a Department"/>
+                                <f:selectItems 
+                                    value="#{searchController.departments}" 
+                                    var="d" 
+                                    itemLabel="#{d.name}" itemValue="#{d}" 
+                                    />
+                            </p:selectOneMenu>
+
+                            <h:outputText value="User" />
+                            <p:autoComplete 
+                                forceSelection="true"
+                                value="#{searchController.webUser}"
+                                placeholder="Select User"
+                                completeMethod="#{webUserController.completeUser}" 
+                                id="user"
+                                var="u" 
+                                itemLabel="#{u.webUserPerson.name}" 
+                                itemValue="#{u}"
+                                class="w-100 mx-4"
+                                inputStyleClass="w-100"
+                                >
+                            </p:autoComplete>
+
+
+
+                        </h:panelGrid>
+                        <h:panelGrid columns="6" class="my-2" >
+                            <p:commandButton 
+                                class="ui-button-warning" 
+                                icon="fas fa-magnifying-glass" 
+                                id="btnSearch" 
+                                ajax="false" 
+                                value="Process" 
+                                action="#{searchController.processAllFinancialTransactionalSummary}"/>
+                            <p:commandButton 
+                                class="ui-button-success mx-2" 
+                                icon="fas fa-file-excel" 
+                                id="btnExcel" 
+                                ajax="false" 
+                                value="Excel" >
+                                <p:dataExporter fileName="All Financial Transactions" type="xlsx" target="tbl" ></p:dataExporter>
+                            </p:commandButton>
+
+                            <p:commandButton 
+                                class="ui-button-info " 
+                                icon="fas fa-print" 
+                                id="btnprint" 
+                                ajax="false" 
+                                value="Print" >
+                                <p:printer 
+                                    target="tbl" >
+                                </p:printer>
+                            </p:commandButton>
+
+                        </h:panelGrid>
+
+                        <p:dataTable 
+                            rowIndexVar="i" 
+                            id="tbl" 
+                            value="#{searchController.billSummaryRows}" 
+                            reflow="true"
+                            var="bill"  
+                            style="min-width: 100%;"  
+                            paginator="true"
+                            paginatorPosition="bottom"
+                            rows="10"
+                            paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                            rowsPerPageTemplate="5,10,15">
+                            <f:facet name="header">
+                                <div class="d-flex gap-2 justify-content-center" style="font-size: 24px; font-weight: 700;">
+                                    <h:outputLabel value="All Financial Transaction Summary"/>
+                                </div>
+                                <h:panelGroup rendered="#{searchController.institution ne null}">
+                                    <div class="d-flex gap-2 justify-content-center" style="font-size: 20px; font-weight: 600;">
+                                        <h:outputLabel value="#{searchController.institution.name}"/>
+                                        <h:panelGroup rendered="#{searchController.department ne null}">
+                                            <h:outputLabel value="-"/>
+                                            <h:outputLabel value="#{searchController.department.name}"/>
+                                        </h:panelGroup>
+                                    </div>
+                                </h:panelGroup>
+                                <h:panelGroup rendered="#{searchController.institution eq null}">
+                                    <div class="d-flex gap-2 justify-content-center" style="font-size: 20px; font-weight: 600;">
+                                        <h:outputLabel value="#{sessionController.institution.name}"/>
+                                    </div>
+                                </h:panelGroup>
+                                <div class="d-flex gap-2 justify-content-center" style="font-size: 16px; font-weight: 400;">
+                                    <h:outputLabel value="#{searchController.fromDate}">
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}  HH:mm:ss a" ></f:convertDateTime>
+                                    </h:outputLabel>
+                                    <h:outputLabel value="to"/>
+                                    <h:outputLabel value="#{searchController.toDate}">
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}  HH:mm:ss a" ></f:convertDateTime>
+                                    </h:outputLabel>
+                                </div>
+                            </f:facet>
+
+                            <p:column headerText="Bill Type" styleClass="alignTop">
+                                <h:outputLabel value="#{bill.billTypeAtomic.label}"/>
+                                <f:facet name="footer">
+                                    Total
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Count" width="4em">
+                                <h:outputLabel value="#{bill.billCount}"/>
+                                <f:facet name="footer">
+
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Gross Total" width="8em">
+                                <h:outputLabel value="#{bill.grossTotal}">
+                                    <f:convertNumber pattern="#,##0.00"/>
+                                </h:outputLabel>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.grossTotal}">
+                                        <f:convertNumber pattern="#,##0.00"/>
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Discount" width="8em">
+                                <h:outputLabel value="#{bill.discount}">
+                                    <f:convertNumber pattern="#,##0.00"/>
+                                </h:outputLabel>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.discount}">
+                                        <f:convertNumber pattern="#,##0.00"/>
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Net Value" width="8em">
+                                <h:outputLabel value="#{bill.netTotal}">
+                                    <f:convertNumber pattern="#,##0.00"/>
+                                </h:outputLabel>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.netTotal}">
+                                        <f:convertNumber pattern="#,##0.00"/>
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>                         
+                        </p:dataTable>
+
+
+
+
+                    </p:panel>
+
+                </h:form>
+
+            </ui:define>
+
+        </ui:composition>
+
+    </body>
+</html>
diff --git a/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml b/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml
new file mode 100644
index 0000000000..baaad083ea
--- /dev/null
+++ b/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://xmlns.jcp.org/jsf/html">
+
+    <body>
+
+        <ui:composition template="/resources/template/template.xhtml">
+
+            <ui:define name="content">
+                <p:panel header="Dynamic Reports">
+                   <div class="row" >
+                        <div class="col-md-3" >
+                            <h:form>
+                                <p:accordionPanel activeIndex="#{searchController.manageListIndex}">
+                                    <p:ajax process="@this"></p:ajax>
+
+                                    <p:tab title="Lists">
+                                        <div class="d-grid gap-2">
+                                            <p:commandButton 
+                                                ajax="false" 
+                                                value="Dynamic Report Summary" 
+                                                actionListener="#{searchController.makeNull()}"
+                                                action="#{reportController.navigateToDynamicReportSummary()}"
+                                                class="w-100">
+                                            </p:commandButton>
+                                        </div>
+                                    </p:tab>
+                                </p:accordionPanel>
+                            </h:form>
+                        </div>
+                        <div class="col-md-9" >
+                            <ui:insert name="subcontent">
+                            </ui:insert>
+                        </div>
+                    </div> 
+                    
+                </p:panel>
+                
+            </ui:define>
+
+        </ui:composition>
+
+    </body>
+</html>
diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
index af0538dbf1..1e403cadc7 100644
--- a/src/main/webapp/resources/ezcomp/menu.xhtml
+++ b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -1159,7 +1159,9 @@
                     <p:menuitem  ajax="false"  action="#{searchController.navigateToAnalytics}" 
                                  value="Analytics" 
                                  rendered="#{webUserController.hasPrivilege('ReportsSearchCashCardOwn')}" ></p:menuitem>  
-                    <p:menuitem  ajax="false"  action="/reports/index?faces-redirect=true" value="Reports" rendered="#{webUserController.hasPrivilege('ReportsSearchCashCardOwn')}" ></p:menuitem>                                            
+                    <p:menuitem  ajax="false"  action="/reports/index?faces-redirect=true" value="Reports" rendered="#{webUserController.hasPrivilege('ReportsSearchCashCardOwn')}" ></p:menuitem> 
+                    <p:menuitem  ajax="false"  action="/reports/dynamic_reports/dynamic_reports?faces-redirect=true" 
+                                 value="Dynamic Reports" rendered="#{webUserController.hasPrivilege('ReportsSearchCashCardOwn')}" ></p:menuitem> 
                     <p:menuitem  ajax="false"  action="/reportInstitution/report_own?faces-redirect=true" value="Institution Report" rendered="#{webUserController.hasPrivilege('ReportsSearchCashCardOwn')}" ></p:menuitem>                               
                     <p:menuitem  ajax="false"  action="/reportIncome/report_income?faces-redirect=true" value="Income Report"  ></p:menuitem>
                     <p:menuitem  ajax="false"  action="/revenue_reports/index?faces-redirect=true" value="Revenue Reports"  ></p:menuitem>

From ff23895c1c7b9198dfd412cb911b701c68a7a727 Mon Sep 17 00:00:00 2001
From: Lahiru Rasanjaya <phlrasanjaya@gmail.com>
Date: Sat, 27 Jul 2024 19:05:07 +0530
Subject: [PATCH 3/3] close Issue#6624 Signed-off-by: Lahiru Rasanjaya
 <phlrasanjaya@gmail.com>

---
 src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml b/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml
index baaad083ea..8c76690b27 100644
--- a/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml
+++ b/src/main/webapp/reports/dynamic_reports/dynamic_reports.xhtml
@@ -31,7 +31,7 @@
                                 </p:accordionPanel>
                             </h:form>
                         </div>
-                        <div class="col-md-9" >
+                        <div class="col-md-9"  >
                             <ui:insert name="subcontent">
                             </ui:insert>
                         </div>