From 8c6480d6af55f750321209856c5825628fd3005b Mon Sep 17 00:00:00 2001
From: DamithDeshan <hkddrajapaksha@gmail.com>
Date: Sun, 11 Aug 2024 13:31:16 +0530
Subject: [PATCH 1/2] Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

---
 src/main/resources/META-INF/persistence.xml   |  4 +-
 .../webapp/admin/lims/report_template.xhtml   | 38 +++++++++----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index bbd2390cb6..24c99bf695 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/ruhunuDemo</jta-data-source>
+    <jta-data-source>jdbc/arogya</jta-data-source>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <properties>
       <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -11,7 +11,7 @@
   </persistence-unit>
   
   <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-    <jta-data-source>jdbc/ruhunuDemoAudit</jta-data-source>
+    <jta-data-source>jdbc/arogyaAudit</jta-data-source>
     <class>com.divudi.entity.AuditEvent</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
diff --git a/src/main/webapp/admin/lims/report_template.xhtml b/src/main/webapp/admin/lims/report_template.xhtml
index 3603a1c77c..6153969738 100644
--- a/src/main/webapp/admin/lims/report_template.xhtml
+++ b/src/main/webapp/admin/lims/report_template.xhtml
@@ -48,13 +48,13 @@
 
 
                                     <p:panel header="Actions" >
-                                        <p:panelGrid columns="4" >
+                                        <h:panelGrid columns="4" >
                                             <p:commandButton ajax="false" value="Add New Label" action="#{commonReportItemController.addNewLabel()}"/>
                                             <p:commandButton ajax="false"  value="Add New Value" action="#{commonReportItemController.addNewValue()}"/>
                                             <p:commandButton ajax="false"  value="Duplicate Report" action="#{commonReportItemController.duplicate()}"/>
                                             <p:commandButton  ajax="false" rendered="false" value="Add All" action="#{commonReportItemController.addAllToCat}"/>
 
-                                        </p:panelGrid>
+                                        </h:panelGrid>
 
                                     </p:panel>
 
@@ -62,7 +62,7 @@
                                 </p:panel>
 
                                 <p:panel header="Report Items List" id="pIx">
-                                    <p:panelGrid columns="3" >
+                                    <h:panelGrid columns="3" >
                                         <h:selectOneListbox size="1"  id="dtbItem" value="#{commonReportItemController.current}" style="width: 270px;" >
                                             <f:selectItems value="#{commonReportItemController.items}" var="ii" itemLabel="#{ii.name}" itemValue="#{ii}" />
                                             <f:ajax event="change" execute="dtbItem" render=":#{p:resolveFirstComponentWithId('pDetails',view).clientId} :#{p:resolveFirstComponentWithId('pPreview',view).clientId}"/>
@@ -71,7 +71,7 @@
                                         <p:commandButton ajax="false" action="#{commonReportItemController.duplicateItem()}" value="Duplicate"/>
                                         <p:commandButton ajax="false" action="#{commonReportItemController.removeItem()}" value="Remove"/>
 
-                                    </p:panelGrid>
+                                    </h:panelGrid>
 
                                 </p:panel>
 
@@ -88,7 +88,7 @@
 
                                     <p:panel  id="pNameDetails" >
 
-                                        <p:panelGrid  columns="2" class="w-100">
+                                        <h:panelGrid  columns="2" class="w-100">
                                             <h:outputText value="Name"   />
                                             <p:inputText 
                                                 class="w-100"
@@ -113,8 +113,8 @@
                                             </p:selectOneMenu>
 
 
-                                        </p:panelGrid>
-                                        <p:panelGrid columns="5" >
+                                        </h:panelGrid>
+                                        <h:panelGrid columns="5" >
                                             <h:outputText value="Type"/>
                                             <p:selectOneMenu id="cmbItemType" value="#{commonReportItemController.current.ixItemType}" >
                                                 <f:selectItem itemLabel="Label" itemValue="Label"/>
@@ -129,18 +129,15 @@
                                             <p:selectOneMenu id="cmbValueType" value="#{commonReportItemController.current.ixItemValueType}"  >
                                                 <f:selectItems value="#{enumController.investigationItemValueTypes}" ></f:selectItems>
                                             </p:selectOneMenu>
-                                        </p:panelGrid>
-                                        <p:panelGrid columns="2" >
+                                        </h:panelGrid>
+                                        <h:panelGrid columns="2" >
                                             <p:outputLabel value="Contents" ></p:outputLabel>
                                             <p:inputTextarea value="#{commonReportItemController.current.description}" style="min-width: 400px!important;"></p:inputTextarea>
-
-                                        </p:panelGrid>
-
-
+                                        </h:panelGrid>
                                     </p:panel>
 
                                     <p:panel header="Positioning" >
-                                        <p:panelGrid  columns="11">
+                                        <h:panelGrid  columns="11">
                                             <h:outputText value="Left" />
                                             <p:inputText style="width: 80px;"  autocomplete="off" id="txtLeft" value="#{commonReportItemController.current.riLeft}"/>
                                             <div style="min-width: 20px;"></div>
@@ -153,8 +150,8 @@
                                             <h:outputText value="Height"/>
                                             <p:inputText  style="width: 80px;"  autocomplete="off" id="txtHeight" value="#{commonReportItemController.current.riHeight}"/>
 
-                                        </p:panelGrid>
-                                        <p:panelGrid columns="5" >
+                                        </h:panelGrid>
+                                        <h:panelGrid columns="5" >
                                             <h:outputText value="Height PX" />
                                             <p:inputText style="width: 50px;"  autocomplete="off" id="txtHtPx" 
                                                          value="#{commonReportItemController.current.htPix}"/>
@@ -164,9 +161,8 @@
                                                           value="#{commonReportItemController.current.wtPix}"/>
                                             <div style="min-width: 20px;"></div>
 
-                                        </p:panelGrid>
-                                        <p:panelGrid columns="5" >
-
+                                        </h:panelGrid>
+                                        <h:panelGrid columns="5" >
                                             <h:outputText value="Text-Align"/>
                                             <p:selectOneMenu  id="cmbTxtAlign" value="#{commonReportItemController.current.cssTextAlign}"  >
                                                 <f:selectItem itemLabel="Left" itemValue="Left"/>
@@ -180,7 +176,7 @@
                                             <p:selectOneMenu  id="cmbTxtVerticalAlign" value="#{commonReportItemController.current.cssVerticalAlign}"  >
                                                 <f:selectItems value="#{enumController.cssVerticalAlign}" ></f:selectItems>
                                             </p:selectOneMenu>
-                                        </p:panelGrid>
+                                        </h:panelGrid>
                                     </p:panel>
 
 
@@ -195,7 +191,7 @@
                                             <p:inputText style="width: 50px;" autocomplete="off" id="txtFontSize" value="#{commonReportItemController.current.riFontSize}"/>
 
                                         </h:panelGrid>
-                                        <h:panelGrid  columns="5">
+                                        <h:panelGrid columns="5">
                                             <h:outputText value="Font Style"/>
                                             <p:selectOneMenu  id="cmbPos" value="#{commonReportItemController.current.cssFontStyle}" >
                                                 <f:selectItem itemLabel="Normal" itemValue="Normal"/>

From d3155fbfc8e65e630fddcea6960d4b3af3070e45 Mon Sep 17 00:00:00 2001
From: DamithDeshan <hkddrajapaksha@gmail.com>
Date: Sun, 11 Aug 2024 13:31:36 +0530
Subject: [PATCH 2/2] closes#6844 Signed-off-by: DamithDeshan
 <hkddrajapaksha@gmail.com>

---
 src/main/webapp/admin/lims/report_template.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/admin/lims/report_template.xhtml b/src/main/webapp/admin/lims/report_template.xhtml
index 6153969738..3b93cf088c 100644
--- a/src/main/webapp/admin/lims/report_template.xhtml
+++ b/src/main/webapp/admin/lims/report_template.xhtml
@@ -23,7 +23,7 @@
 
                             <h:panelGroup>
                                 <p:panel header="Report">
-
+ 
                                     <h:panelGrid columns="2" >
 
                                         <p:selectOneMenu  id="mnuCat" value="#{commonReportItemController.category}"  style="width: 300px!important;">