Merge pull request #6485 from hmislk/Issue#6484

Issue#6484 Closes #6484
hmislk · Jul 21, 2024 · bbf5b95 · bbf5b95
2 parents 11aa719 + 3d606fb
commit bbf5b95
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-12
+12
diff --git a/README.md b/README.md
@@ -18,10 +18,8 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-
 Current Version: 3.0.0.20240721.12 (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/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <version>3.0.0</version>
     <packaging>war</packaging>
     <name>sethma</name>
-
+  
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240721.12
+3.0.0.20240721.12
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -4,7 +4,6 @@
 
   <context-root>/sethma</context-root>
 
-
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml
@@ -117,7 +117,7 @@
                                     <p:tabView id="tblBillItem" >
                                         <p:tab id="pacName" title="Package Name" >
                                             <div class="d-flex justify-content-between">
-                                                <h:outputLabel value="#{billPackageController.currentBillItem.item.name}"/>
+                                                <h:outputLabel  style="font-weight: 500; font-size: 18px;" value="#{billPackageController.currentBillItem.item.name}"/>
                                                 <p:commandButton 
                                                     id="btnRemove" 
                                                     value="X" 
@@ -136,29 +136,30 @@
                                                 var="bi" class="w-100" 
                                                 >
 
-                                                <p:column>
+                                                <p:column  style="width: 30px;">
                                                     <f:facet name="header">No</f:facet>
                                                         #{rowIndex+1}
                                                 </p:column>
                                                 <p:column>
                                                     <f:facet name="header">Item</f:facet>
                                                         #{bi.billItem.item.name}
                                                 </p:column>
-                                                <p:column>
+                                                <p:column  style="width: 200px;">
                                                     <f:facet name="header">Fee</f:facet>
                                                     <h:outputLabel value="#{bi.billItem.netValue}">
                                                         <f:convertNumber pattern="#,##0.00" />
                                                     </h:outputLabel>
                                                 </p:column>
-                                                <p:column>
+                                                <p:column  style="width: 200px;">
                                                     <f:facet name="header">Department</f:facet>
                                                         #{bi.billItem.item.department.name}
                                                 </p:column>
-                                                <p:column>
+                                                <p:column  style="width: 50px;">
                                                     <p:commandButton 
                                                         id="btnRemove" 
                                                         value="X" 
                                                         title="Remove"
+                                                        disabled="#{!bi.billItem.item.canRemoveItemfromPackage}"
                                                         class="ui-button-danger"
                                                         rendered="#{billPackageController.currentBillItem.item ne null}" 
                                                         action="#{billPackageController.removeBillItem(bi.billItem.item)}" 
@@ -170,7 +171,7 @@
                                         </p:tab>
                                         <p:tab id="tabBillIx" title="Tests" >
                                             <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillComponents}" var="bix" >
-                                                <p:column>
+                                                <p:column  style="width: 30px;">
                                                     <f:facet name="header">No</f:facet>
                                                         #{rowIndex+1}
                                                 </p:column>
@@ -183,18 +184,24 @@
                                         </p:tab>
                                         <p:tab id="tabBillFee" title="Fees" >
                                             <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillFees}" var="bif" >
-                                                <p:column>
+                                                <p:column style="width: 30px;">
                                                     <f:facet name="header">No</f:facet>
                                                         #{rowIndex+1}
                                                 </p:column>
-                                                <p:column>
+
+                                                <p:column >
+                                                    <f:facet name="header">Item </f:facet>
+                                                    <h:outputLabel  value="#{bif.billItem.item.name}"/>
+                                                </p:column>
+
+                                                <p:column style="width: 200px;">
                                                     <f:facet name="header">Fee</f:facet>
-                                                    <h:inputText autocomplete="off" id="txtFeeVal" value="#{bif.feeValue}" disabled="#{!bif.billItem.item.userChangable}" >
+                                                    <p:inputText autocomplete="off" id="txtFeeVal" value="#{bif.feeValue}" disabled="#{!bif.billItem.item.userChangable}" >
                                                         <f:convertNumber pattern="#,##0.00" />
                                                         <f:ajax event="keyup" execute="txtFeeVal" render=" :#{p:resolveFirstComponentWithId('tblRequests',view).clientId}  :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}" listener="#{billPackageController.feeChanged}" />
-                                                    </h:inputText>
+                                                    </p:inputText>
                                                 </p:column>
-                                                <p:column>
+                                                <p:column style="width: 200px;">
                                                     <f:facet name="header">Payee</f:facet>
                                                     <h:outputLabel value="#{bif.department.name}" rendered="#{bif.department!=null}" ></h:outputLabel>
                                                     <h:outputLabel value="#{bif.staff.person.name}" rendered="#{bif.staff!=null and bif.fee.speciality==null}" ></h:outputLabel>