Merge pull request #6495 from hmislk/Issue#6494

Issue#6494 Closes #6494
hmislk · Jul 21, 2024 · f79933a · f79933a
2 parents 93c17ea + 52519e6
commit f79933a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 Current Version: 3.0.0.20240721.16 (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.

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,6 +2,7 @@
 <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/hims</jta-data-source>
 
         <exclude-unlisted-classes>false</exclude-unlisted-classes>

diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -2,10 +2,8 @@
 <!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">

diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_department.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_department.xhtml
@@ -21,13 +21,15 @@
                                 <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="Department :" />
+                                <h:outputLabel value="Department " />
                                 <p:autoComplete value="#{opdMemberShipDiscountController.department}" 
                                                 forceSelection="true"
                                                 completeMethod="#{departmentController.completeDept}" 
-                                                var="dep" itemLabel="#{dep.name}" itemValue="#{dep}" >
+                                                var="dep" itemLabel="#{dep.name}" itemValue="#{dep}" class="w-100"
+                                                    inputStyleClass="w-100">
                                     <p:column>
                                         <h:outputLabel value="#{dep.name}"/>
                                     </p:column>
@@ -36,24 +38,25 @@
                                     </p:column>
                                 </p:autoComplete>
                                 <h:outputLabel value="Payment Method"/>
-                                <p:selectOneMenu   value="#{opdMemberShipDiscountController.paymentMethod}"  >
+                                <p:selectOneMenu   value="#{opdMemberShipDiscountController.paymentMethod}" class="w-100"  >
                                     <f:selectItem itemLabel="Select" />                           
                                     <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="" />
-                                <p:commandButton id="btnAdd" value="Add" ajax="false" 
+                                <p:commandButton id="btnAdd" value="Add" ajax="false" icon="fa fa-plus"
+                                                class="mx-1 ui-button-success"
                                                 action="#{opdMemberShipDiscountController.saveSelectedDepartmentPaymentScheme}" />
 
-                                <p:defaultCommand target="btnAdd"/>
+
                             </p:panelGrid>
-                            <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton" style="float: right;" >
+                            <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton" style="float: right;"  class="ui-button-success" icon="fas fa-file-excel">
                                 <p:dataExporter type="xlsx" target="inwd" fileName="Price_metrix_investigation"  />
                             </p:commandButton>
                             <p:commandButton ajax="false" value="Fill" 
-                                            action="#{opdMemberShipDiscountController.createItemsDepartmentsPaymentScheme}" />
-                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" >                                         
+                                            action="#{opdMemberShipDiscountController.createItemsDepartmentsPaymentScheme}" class="m-1"/>
+                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton"  class="ui-button-info mx-1" icon="fas fa-print">                                         
                                 <p:printer target="reportPrint"/>
                             </p:commandButton>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,6 +22,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
		Current Version: 3.0.0.20240721.16 (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.
Expand Down