Merge pull request #6493 from hmislk/Issue#6491

Issue#6491 Closes #6491

.github/counter.txt

@@ -1 +1,2 @@
 15
+

README.md

@@ -18,8 +18,10 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
+
 Current Version: 3.0.0.20240721.15 (This line will be automatically updated to reflect the latest version)
 
+
 ## History
 
 In 2004, Dr. M H B Ariyaratne, a medical doctor, pioneered the development of an Electronic Medical Record (EMR) System tailored for his general practice. Utilising Microsoft Visual Basic 6 and MS-Access, this system caught the attention of fellow doctors, leading to widespread adoption. As its user base grew, so did its features, evolving through collaborative discussions and feedback.

src/main/resources/META-INF/persistence.xml

@@ -2,15 +2,15 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/demos</jta-data-source>
+        <jta-data-source>jdbc/hims</jta-data-source>
 
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/demoaudit</jta-data-source>
+        <jta-data-source>jdbc/himsAduit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>

src/main/webapp/WEB-INF/glassfish-web.xml

@@ -2,8 +2,10 @@
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
 
+
   <context-root>/sethma</context-root>
 
+
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

src/main/webapp/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category.xhtml

@@ -15,16 +15,17 @@
                 <h:form>
                     <p:panel header="Pharmacy Membership Discount Matrix" id="reportPrint">
 
-                        <p:panel header="Add new Matrix" >
-                            <p:panelGrid columns="2" >
+                        <p:panel header="Add New Matrix" >
+                            <p:panelGrid columns="2" class="w-25">
                                 <h:outputLabel value="Discount Scheme"/>
                                 <p:autoComplete forceSelection="true" 
                                                 value="#{opdMemberShipDiscountController.paymentScheme}" 
                                                 completeMethod="#{paymentSchemeController.completePaymentScheme}" 
-                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" >
+                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" class="w-100"
+                                                    inputStyleClass="w-100">
                                 </p:autoComplete>
                                 <h:outputLabel value="Category/Subcategory" ></h:outputLabel>
-                                <p:selectOneMenu value="#{opdMemberShipDiscountController.category}" >
+                                <p:selectOneMenu value="#{opdMemberShipDiscountController.category}" class="w-100">
                                     <f:selectItem itemLabel="Select" ></f:selectItem>
                                     <f:selectItems value="#{pharmaceuticalItemCategoryController.items}"
                                                    var="c"
@@ -47,18 +48,18 @@
                                     <f:selectItems value="#{enumController.allPaymentMethods}" />                                    
                                 </p:selectOneMenu>
                                 <h:outputLabel value="Discount" ></h:outputLabel>
-                                <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" />
+                                <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" class="w-100"/>
                                 <h:outputLabel value="" ></h:outputLabel>
                                 <p:commandButton id="btnAdd" value="Add" ajax="false"
                                                 action="#{opdMemberShipDiscountController.savePharmacyCategoryPaymentScheme()}" >
                                 </p:commandButton>
 
-                                <p:defaultCommand target="btnAdd"/>
+
                             </p:panelGrid>
                             <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton" style="float: right;" >
                                 <p:dataExporter type="xlsx" target="inwd" fileName="Price_metrix_investigation"  />
                             </p:commandButton>
-                            <p:commandButton ajax="false" value="Fill"
+                            <p:commandButton ajax="false" value="Fill" class="m-1"
                                             action="#{opdMemberShipDiscountController.createItemsCategoryPharmacyPaymentScheme()}" />
                             <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" >                                         
                                 <p:printer target="reportPrint"/>