Closes #8659

Signed-off-by: Buddhika Ariyaratne <[email protected]>
hmislk · Nov 9, 2024 · d5cb043 · d5cb043
1 parent b8358c7
commit d5cb043
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/src/main/java/com/divudi/ws/common/ApplicationConfig.java b/src/main/java/com/divudi/ws/common/ApplicationConfig.java
@@ -38,6 +38,7 @@ public Set<Class<?>> getClasses() {
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(com.divudi.ws.channel.ChannelApi.class);
         resources.add(com.divudi.ws.channel.CorsResponseFilter.class);
+        resources.add(com.divudi.ws.common.ApiMembership.class);
         resources.add(com.divudi.ws.common.ConfigResource.class);
         resources.add(com.divudi.ws.fhir.Fhir.class);
         resources.add(com.divudi.ws.finance.Finance.class);

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/arogya</jta-data-source>
+        <jta-data-source>jdbc/digasiri</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/arogyaAudit</jta-data-source>
+        <jta-data-source>jdbc/ruhunuAudit</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/ezcomp/common/patient_details_for_addmission.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details_for_addmission.xhtml
@@ -22,6 +22,7 @@
 
             <p:growl id="msg"/>
             <f:facet name="header">
+
                 <h:panelGroup layout="block" styleClass="d-flex justify-content-between align-items-center">
                     <!-- Left aligned content -->
                     <h:panelGroup id="headerFacet">

diff --git a/src/main/webapp/resources/inward/bill/finalBill.xhtml b/src/main/webapp/resources/inward/bill/finalBill.xhtml
@@ -51,12 +51,20 @@
                     </h:panelGroup>
 
                     <table class="headingPrinting" >
-                        <tr>
-                            <td colspan="4">
-                                <h:outputLabel style="font-size: 13px; float: right; font-weight: normal; margin-bottom: 20px;" value="Vat Reg. No:100890860-7000" />
-                            </td>
-                        </tr>
-
+                        <h:panelGroup rendered="#{not empty configOptionApplicationController.getLongTextValueByKey('Inaptient Final Bill Header Image URL')}" >
+                            <tr >
+                                <td colspan="4">
+                                    <h:graphicImage 
+                                        style="width: 100%;"
+                                        class="mb-4"
+                                        url="#{configOptionApplicationController.getLongTextValueByKey('Inaptient Final Bill Header Image URL')}"
+                                        >
+                                    </h:graphicImage>
+                                </td>
+                            </tr>
+                        </h:panelGroup>
+
+
                         <tr>
                             <td colspan="4">
                                 <h:outputLabel class="mark" style="font-size: 18px;" value="**Hospital Bill**" rendered="#{cc.attrs.hosCopy eq true }"/>
@@ -183,17 +191,17 @@
 
                                 </div>
                             </div>
-<!--                            <div class="col-6 W-100 ">
-                                <div class="col-6 d-flex justify-content-between">
-                                    <div class="col-5 w-100 d-flex justify-content-between">
-                                        <h:outputLabel value="Vat Reg. No " />
-                                        <h:outputLabel value=":" style="width: 20px; text-align: center;"/>
-                                    </div>
-                                    <div class="col-7 d-flex w-100">
-
-                                    </div>
-                                </div>
-                            </div>-->
+                            <!--                            <div class="col-6 W-100 ">
+                                                            <div class="col-6 d-flex justify-content-between">
+                                                                <div class="col-5 w-100 d-flex justify-content-between">
+                                                                    <h:outputLabel value="Vat Reg. No " />
+                                                                    <h:outputLabel value=":" style="width: 20px; text-align: center;"/>
+                                                                </div>
+                                                                <div class="col-7 d-flex w-100">
+                            
+                                                                </div>
+                                                            </div>
+                                                        </div>-->
                         </div>
 
                     </div>