Signed-off-by: PasinduW99 <pwathsara@gmail.com>

hmislk · Dec 19, 2024 · 43f799a · 43f799a
1 parent 4005ab4
commit 43f799a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git 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/southernlanka</jta-data-source>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <properties>
       <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -13,7 +13,7 @@
     </properties>
   </persistence-unit>
   <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-    <jta-data-source>jdbc/ruhunuAudit</jta-data-source>
+    <jta-data-source>jdbc/southernlankaAudit</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/pharmacy/pharmacy_transer_request_report_detail.xhtml b/src/main/webapp/pharmacy/pharmacy_transer_request_report_detail.xhtml
@@ -14,7 +14,7 @@
 
         <h:panelGroup rendered="true" >
             <h:form>
-                <p:panel  styleClass="noBorder summeryBorder" header="Transfer Issue Summary">
+                <p:panel  styleClass="noBorder summeryBorder" header="Transfer Report Summary">
                     <h:panelGrid columns="4" class="w-100">
                         <h:outputLabel value="From Date"/>
                         <p:calendar id="frmDate" value="#{commonReport.fromDate}" navigator="true"  pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  >
@@ -54,14 +54,14 @@
                         <p:commandButton 
                             id="btnRefresh" 
                             ajax="false" 
-                            value="Fill To Be Transfer" 
+                            value="Requests to be issued" 
                             icon="fa-solid fa-fill"
                             class="ui-button-warning"
                             actionListener="#{commonReport.fillToBeTranserDeatilReport()}"
                             style="float: right;" />  
                         <p:commandButton 
                             ajax="false" 
-                            value="Fill Transfered" 
+                            value="Completed Transfers" 
                             icon="fa-solid fa-fill"
                             class="mx-1 ui-button-warning"
                             actionListener="#{commonReport.fillTranserDeatilReport()}"

diff --git a/src/main/webapp/resources/pharmacy/transferIssue.xhtml b/src/main/webapp/resources/pharmacy/transferIssue.xhtml
@@ -98,7 +98,7 @@
 
                     <p:column style="text-align: right;">
                         <f:facet name="header">
-                            <h:outputLabel value="Cost Price"/>
+                            <h:outputLabel value="Purchase Rate"/>
                         </f:facet>
                         <h:outputLabel value="#{bip.pharmaceuticalBillItem.itemBatch.purcahseRate}">
                             <f:convertNumber pattern="#0.00" />
@@ -113,6 +113,24 @@
                             <f:convertNumber pattern="#0.00" />
                         </h:outputLabel>
                     </p:column>
+
+                    <p:column style="text-align: right;">
+                        <f:facet name="header">
+                            <h:outputLabel value="Sale Rate"/>
+                        </f:facet>
+                        <h:outputLabel value="#{bip.pharmaceuticalBillItem.itemBatch.retailsaleRate}">
+                            <f:convertNumber pattern="#0.00" />
+                        </h:outputLabel>
+                    </p:column>
+
+                    <p:column style="text-align: right;">
+                        <f:facet name="header">
+                            <h:outputLabel value="Value"/>
+                        </f:facet>
+                        <h:outputLabel value="#{0-bip.pharmaceuticalBillItem.itemBatch.retailsaleRate*bip.pharmaceuticalBillItem.qty}">
+                            <f:convertNumber pattern="#0.00" />
+                        </h:outputLabel>
+                    </p:column>
 
 <!--                    <p:column style="text-align: right;">
                         <f:facet name="header">