grn bill improvement

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
hmislk · Feb 21, 2025 · d7b6e19 · d7b6e19
1 parent 6110b21
commit d7b6e19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/divudi/ws/common/ApplicationConfig.java b/src/main/java/com/divudi/ws/common/ApplicationConfig.java
@@ -46,6 +46,7 @@ private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(com.divudi.ws.finance.clinical.Fhir.class);
         resources.add(com.divudi.ws.inward.ApiInward.class);
         resources.add(com.divudi.ws.lims.Lims.class);
+        resources.add(com.divudi.ws.lims.LimsMiddlewareController.class);
         resources.add(com.divudi.ws.lims.MiddlewareController.class);
     }
 

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,14 +2,14 @@
 <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_DATASOURCE}</jta-data-source>
+        <jta-data-source>jdbc/hmis</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>
+        <jta-data-source>jdbc/hmisaudit</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/resources/pharmacy/grn.xhtml b/src/main/webapp/resources/pharmacy/grn.xhtml
@@ -134,7 +134,13 @@
                     <tbody style="font-size: 11px;">
                         <ui:repeat value="#{cc.attrs.bill.billItems}" var="bip">
                             <tr>
-                                <td style="text-align: left;">#{bip.item.name}</td>
+                                <td style="text-align: left;">
+                                    <h:outputText value="#{bip.item.name}">
+                                    </h:outputText>
+
+                                    <h:outputText rendered="#{not empty bip.item.code}" value=" - #{bip.item.code}">
+                                    </h:outputText>
+                                </td>
                                 <!--                                <td style="text-align: right;">
                                                                     <h:outputText value="#{bip.item.code}">
                                                                     </h:outputText>