From 76282dd23f34feed2e3d376e8ce517c701ce8393 Mon Sep 17 00:00:00 2001
From: buddhika75 <buddhika.ari@gmail.com>
Date: Sun, 4 Aug 2024 06:52:13 +0530
Subject: [PATCH 1/3] Signed-off-by: buddhika75 <buddhika.ari@gmail.com>

---
 src/main/webapp/WEB-INF/glassfish-web.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
index 1b2b772442..9841584308 100644
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>/ruhunu1</context-root>
+  <context-root>/ruhunuDemo</context-root>
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

From b06eee9d7950f17995bfb3f6d956ed5f2a3b2896 Mon Sep 17 00:00:00 2001
From: "Dr. M H B Ariyaratne" <buddhika.ari@gmail.com>
Date: Sun, 4 Aug 2024 09:30:44 +0530
Subject: [PATCH 2/3] Signed-off-by: Dr. M H B Ariyaratne
 <buddhika.ari@gmail.com>

---
 .../CollectingCentreBillController.java       |  57 +-
 .../collectingCentre/CourierController.java   |   4 +
 .../divudi/bean/common/SearchController.java  |   6 +-
 .../divudi/bean/common/SessionController.java |   5 +
 src/main/java/com/divudi/data/LoginPage.java  |  15 +-
 src/main/resources/META-INF/persistence.xml   |   4 +-
 src/main/webapp/WEB-INF/glassfish-web.xml     |   2 +-
 src/main/webapp/collecting_centre/bill.xhtml  |  99 +--
 .../collecting_centre/courier/index.xhtml     |  33 +-
 .../courier/viewReports.xhtml                 | 762 ++++++++++++------
 10 files changed, 614 insertions(+), 373 deletions(-)

diff --git a/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java b/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java
index d248cc23b9..e13cdbeec9 100644
--- a/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java
+++ b/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java
@@ -149,6 +149,8 @@ public class CollectingCentreBillController implements Serializable, ControllerW
     StaffBean staffBean;
     @Inject
     CategoryController categoryController;
+    @Inject
+    ConfigOptionApplicationController configOptionApplicationController;
     /**
      * Properties
      */
@@ -1089,14 +1091,15 @@ private boolean errorCheck() {
             JsfUtil.addErrorMessage("Please select a collecting centre");
             return true;
         }
-        if (referralId == null || referralId.trim().equals("")) {
-            JsfUtil.addErrorMessage("Please enter a referrance number");
-            return true;
+        boolean collectingCentreBillingRequiresReferanceNumbers = configOptionApplicationController.getBooleanValueByKey("Collecting Centre Billing Requires Referance Numbers", true);
+        boolean collectingCentreBillingRequiresCreditBalanceManagement = configOptionApplicationController.getBooleanValueByKey("Collecting Centre Billing Requires Credit Balance Management", true);
+
+        if (collectingCentreBillingRequiresReferanceNumbers) {
+            if (referralId == null || referralId.trim().equals("")) {
+                JsfUtil.addErrorMessage("Please enter a referrance number");
+                return true;
+            }
         }
-//        else if (collectingCenterReferranceNumberAlreadyUsed(collectingCentre)) {
-//            JsfUtil.addErrorMessage("Referral number alredy entered");
-//            return true;
-//        }
 
         if (getLstBillEntries().isEmpty()) {
             JsfUtil.addErrorMessage("Please Add tests before billing");
@@ -1110,31 +1113,25 @@ private boolean errorCheck() {
             }
         }
 
-        ///not wanted 
-//        if ((collectingCentre.getBallance() - Math.abs(feeTotalExceptCcfs)) < 0 - collectingCentre.getStandardCreditLimit()) {
-//            JsfUtil.addErrorMessage("This bill excees the Collecting Centre Limit");
-//            return true;
-//        }
-    double awailableBalance = Math.abs(collectingCentre.getBallance() + Math.abs(collectingCentre.getAllowedCredit()));
-
-        if (awailableBalance < Math.abs(feeTotalExceptCcfs)) {
-            JsfUtil.addErrorMessage("Collecting Centre Balance is Not Enough");
-            return true;
-        }
+        double awailableBalance = Math.abs(collectingCentre.getBallance() + Math.abs(collectingCentre.getAllowedCredit()));
 
-//        if (agentReferenceBookController.numberHasBeenIssuedToTheAgent(getReferralId())) {
-//            JsfUtil.addErrorMessage("Invaild Reference Number.");
-//            return true;
-//        }
-        if (agentReferenceBookController.agentReferenceNumberIsAlredyUsed(getReferralId(), collectingCentre, BillType.CollectingCentreBill, PaymentMethod.Agent)) {
-            JsfUtil.addErrorMessage("This Reference Number is alredy Used.");
-            setReferralId("");
-            return true;
+        if (collectingCentreBillingRequiresCreditBalanceManagement) {
+            if (awailableBalance < Math.abs(feeTotalExceptCcfs)) {
+                JsfUtil.addErrorMessage("Collecting Centre Balance is Not Enough");
+                return true;
+            }
         }
 
-        if (!agentReferenceBookController.numberHasBeenIssuedToTheAgent(collectingCentre, getReferralId())) {
-            JsfUtil.addErrorMessage("This Reference Number is Blocked Or This channel Book is Not Issued.");
-            return true;
+        if (collectingCentreBillingRequiresReferanceNumbers) {
+            if (agentReferenceBookController.agentReferenceNumberIsAlredyUsed(getReferralId(), collectingCentre, BillType.CollectingCentreBill, PaymentMethod.Agent)) {
+                JsfUtil.addErrorMessage("This Reference Number is alredy Used.");
+                setReferralId("");
+                return true;
+            }
+            if (!agentReferenceBookController.numberHasBeenIssuedToTheAgent(collectingCentre, getReferralId())) {
+                JsfUtil.addErrorMessage("This Reference Number is Blocked Or This channel Book is Not Issued.");
+                return true;
+            }
         }
 
         return false;
@@ -1533,7 +1530,7 @@ public String navigateToCollectingCenterBillingromCollectingCenterBilling() {
         setPatient(getPatient());
         return "/collecting_centre/bill?faces-redirect=true";
     }
-    
+
     public String navigateToCollectingCenterBillingfromBillPriview() {
         prepareNewBillKeepingCollectingCenter();
         fillAvailableAgentReferanceNumbers(collectingCentre);
diff --git a/src/main/java/com/divudi/bean/collectingCentre/CourierController.java b/src/main/java/com/divudi/bean/collectingCentre/CourierController.java
index 60a6bcd005..36b633f99d 100644
--- a/src/main/java/com/divudi/bean/collectingCentre/CourierController.java
+++ b/src/main/java/com/divudi/bean/collectingCentre/CourierController.java
@@ -29,6 +29,10 @@ public String navigateToCourierHandoverSamplesToLab() {
     public String navigateToCourierViewReports() {
         return "/collecting_centre/courier/viewReports.xhtml?faces-redirect=true";
     }
+    
+     public String navigateToCourierIndex() {
+        return "/collecting_centre/courier/index.xhtml?faces-redirect=true";
+    }
 
     public String navigateToCourierPrintReports() {
         return "/collecting_centre/courier/printReports.xhtml?faces-redirect=true";
diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
index ff5a8874e0..4c2420a0eb 100644
--- a/src/main/java/com/divudi/bean/common/SearchController.java
+++ b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -992,11 +992,11 @@ public void fillCollectingCentreCourierPatientInvestigations() {
         temMap.put("dep", getReportKeyWord().getDepartment());
         
         if(institution==null){
-            jpql += " b.collectingCentre in :ccs ";
+            jpql += " and b.collectingCentre in :ccs ";
              temMap.put("ccs", sessionController.getLoggableCollectingCentres());
         }else{
-            jpql += " b.collectingCentre=:cc ";
-            temMap.put("ccs", sessionController.getLoggableCollectingCentres());
+            jpql += " and b.collectingCentre=:cc ";
+            temMap.put("cc", sessionController.getLoggableCollectingCentres());
         }
 
         if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) {
diff --git a/src/main/java/com/divudi/bean/common/SessionController.java b/src/main/java/com/divudi/bean/common/SessionController.java
index ed772b9c76..f835f5fa66 100644
--- a/src/main/java/com/divudi/bean/common/SessionController.java
+++ b/src/main/java/com/divudi/bean/common/SessionController.java
@@ -8,6 +8,7 @@
 package com.divudi.bean.common;
 
 import com.divudi.bean.channel.BookingController;
+import com.divudi.bean.collectingCentre.CourierController;
 import com.divudi.bean.pharmacy.PharmacySaleController;
 import com.divudi.data.InstitutionType;
 import com.divudi.data.Privileges;
@@ -123,6 +124,8 @@ public class SessionController implements Serializable, HttpSessionListener {
     BookingController bookingController;
     @Inject
     ConfigOptionApplicationController configOptionApplicationController;
+    @Inject
+    CourierController courierController;
     /**
      * Properties
      */
@@ -1277,6 +1280,8 @@ public String navigateToLoginPageByUsersDefaultLoginPage() {
                 return opdTokenController.navigateToManageOpdTokensCalled();
             case PHARMACY_TOKEN_DISPLAY:
                 return tokenController.navigateToManagePharmacyTokensCalled();
+            case COURIER_LANDING_PAGE:
+                return courierController.navigateToCourierIndex();
             case HOME:
             default:
                 return "/home?faces-redirect=true";
diff --git a/src/main/java/com/divudi/data/LoginPage.java b/src/main/java/com/divudi/data/LoginPage.java
index 7d68953e34..237cb273fa 100644
--- a/src/main/java/com/divudi/data/LoginPage.java
+++ b/src/main/java/com/divudi/data/LoginPage.java
@@ -3,7 +3,7 @@
 /**
  * Enum representing various page types
  *
- * @author Dr M H B Ariyaratne <buddhika.ari at gmail.com>
+ * Author: Dr M H B Ariyaratne <buddhika.ari at gmail.com>
  * Contribution by OpenAI's ChatGPT for additional labels and method implementation.
  */
 public enum LoginPage {
@@ -12,24 +12,15 @@ public enum LoginPage {
     CHANNELLING_TV_DISPLAY("Channelling TV Display"),
     OPD_QUEUE_PAGE("OPD Queue Page"),
     OPD_TOKEN_DISPLAY("OPD Token Display"),
-    PHARMACY_TOKEN_DISPLAY("Pharmacy Token Display");
+    PHARMACY_TOKEN_DISPLAY("Pharmacy Token Display"),
+    COURIER_LANDING_PAGE("Courier Landing Page");
 
     private final String label;
 
-    /**
-     * Constructor for LoginPage enum to set the user-friendly label.
-     *
-     * @param label the user-friendly name of the page type
-     */
     LoginPage(String label) {
         this.label = label;
     }
 
-    /**
-     * Returns the user-friendly name of the page type.
-     *
-     * @return the label of the enum constant
-     */
     public String getLabel() {
         return label;
     }
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index b7178ab1ca..48caf9db30 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-        <jta-data-source>jdbc/ruhunu</jta-data-source>
+        <jta-data-source>jdbc/sethma</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -10,7 +10,7 @@
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/ruhunuAudit</jta-data-source>
+        <jta-data-source>jdbc/sethmaaudit</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/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
index 8947aba09c..4871460e69 100644
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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>/coop</context-root>
+  <context-root>/horizon</context-root>
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">
diff --git a/src/main/webapp/collecting_centre/bill.xhtml b/src/main/webapp/collecting_centre/bill.xhtml
index b38024a897..13f39909e4 100644
--- a/src/main/webapp/collecting_centre/bill.xhtml
+++ b/src/main/webapp/collecting_centre/bill.xhtml
@@ -306,7 +306,7 @@
                                         action="#{collectingCentreBillController.settleBill}" 
                                         ajax="false" 
                                         onclick="if (!confirm('Are you sure you want to Settle This Bill ?'))
-                                                        return false;"
+                                                    return false;"
                                         class="ui-button-success ">
                                     </p:commandButton>
                                     <p:commandButton 
@@ -346,22 +346,28 @@
 
 
                                 </f:facet>
-                                
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <p:outputLabel value="Reference No" class="mr-4"></p:outputLabel>
-                                    </div>
-                                    <div class="col-md-9">
-                                        <p:selectOneMenu
-                                            filter="true"
-                                            filterMatchMode="contains"
-                                            value="#{collectingCentreBillController.referralId}" 
-                                            class="w-100 mb-1">
-                                            <f:selectItem itemLabel="Select" itemValue="" /> <!-- Default empty selection -->
-                                            <f:selectItems value="#{collectingCentreBillController.referralIds}" var="refId"
-                                                           itemLabel="#{refId}" itemValue="#{refId}" />
-                                        </p:selectOneMenu>
+
+                                <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Collecting Centre Billing Requires Referance Numbers', true)}" >
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                            <p:outputLabel value="Reference No" class="mr-4"></p:outputLabel>
+                                        </div>
+                                        <div class="col-md-9">
+                                            <p:selectOneMenu
+                                                filter="true"
+                                                filterMatchMode="contains"
+                                                value="#{collectingCentreBillController.referralId}" 
+                                                class="w-100 mb-1">
+                                                <f:selectItem itemLabel="Select" itemValue="" /> <!-- Default empty selection -->
+                                                <f:selectItems value="#{collectingCentreBillController.referralIds}" var="refId"
+                                                               itemLabel="#{refId}" itemValue="#{refId}" />
+                                            </p:selectOneMenu>
+                                        </div>
                                     </div>
+                                </h:panelGroup>
+
+
+                                <div class="row">
                                     <div class="col-md-3">
                                         <h:outputLabel id="ballance" value="Balance" class="my-1"  />
                                     </div>
@@ -395,35 +401,38 @@
                                         </h:outputLabel>
                                     </div>
                                 </div>
-                                
-                                <h:panelGrid columns="2" class="w-100 ">
-                                    <p:dataTable 
-                                        class="mt-2"
-                                        emptyMessage="No Book"  
-                                        id="tblAgentBooks" 
-                                        value="#{collectingCentreBillController.bookSummeryRows}" 
-                                        var="a" 
-                                        styleClass="noBorder summeryBorder">
-                                        <p:column>
-                                            <f:facet name="header">
-                                                <p:outputLabel value="Book Number" />
-                                            </f:facet>
-                                            <p:outputLabel value="#{a.bookName}" >
-                                                <f:convertNumber pattern="00000" />
-                                            </p:outputLabel>
-                                        </p:column>
 
-                                        <p:column>
-                                            <f:facet name="header">
-                                                <p:outputLabel value="Number Of Leaves" />
-                                            </f:facet>
-                                            <p:outputLabel value="#{a.bookNumber}" >
-                                            </p:outputLabel>
-                                        </p:column>
-                                    </p:dataTable>
+                                <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Collecting Centre Billing Requires Referance Numbers', true)}" >
+
+                                    <h:panelGrid columns="2" class="w-100 ">
+                                        <p:dataTable 
+                                            class="mt-2"
+                                            emptyMessage="No Book"  
+                                            id="tblAgentBooks" 
+                                            value="#{collectingCentreBillController.bookSummeryRows}" 
+                                            var="a" 
+                                            styleClass="noBorder summeryBorder">
+                                            <p:column>
+                                                <f:facet name="header">
+                                                    <p:outputLabel value="Book Number" />
+                                                </f:facet>
+                                                <p:outputLabel value="#{a.bookName}" >
+                                                    <f:convertNumber pattern="00000" />
+                                                </p:outputLabel>
+                                            </p:column>
 
-                                </h:panelGrid>
+                                            <p:column>
+                                                <f:facet name="header">
+                                                    <p:outputLabel value="Number Of Leaves" />
+                                                </f:facet>
+                                                <p:outputLabel value="#{a.bookNumber}" >
+                                                </p:outputLabel>
+                                            </p:column>
+                                        </p:dataTable>
+
+                                    </h:panelGrid>
 
+                                </h:panelGroup>
                             </p:panel>
 
 
@@ -625,13 +634,13 @@
                                                 <bi:posCCBill_CC bill="#{pp}" duplicate="false"/>                        
                                             </ui:repeat>
                                         </h:panelGroup>
-                                        
+
                                         <h:panelGroup rendered="#{sessionController.departmentPreference.opdBillPaperType eq 'FiveFivePaper'}" >
                                             <ui:repeat value="#{collectingCentreBillController.bills}" var="pp">
                                                 <bi:fiveFiveCCBill_CC bill="#{pp}" duplicate="false"/>                        
                                             </ui:repeat>
                                         </h:panelGroup>
-                                        
+
                                     </h:panelGroup>
 
                                 </p:panel>
@@ -659,7 +668,7 @@
                                                 <bi:posCCBill_Patient bill="#{pp}" duplicate="false"/>                        
                                             </ui:repeat>
                                         </h:panelGroup>
-                                        
+
                                         <h:panelGroup rendered="#{sessionController.departmentPreference.opdBillPaperType eq 'FiveFivePaper'}" >
                                             <ui:repeat value="#{collectingCentreBillController.bills}" var="pp">
                                                 <bi:fiveFiveCCBill_Patient bill="#{pp}" duplicate="false"/>                        
diff --git a/src/main/webapp/collecting_centre/courier/index.xhtml b/src/main/webapp/collecting_centre/courier/index.xhtml
index 8e5914af1a..e2af365ede 100644
--- a/src/main/webapp/collecting_centre/courier/index.xhtml
+++ b/src/main/webapp/collecting_centre/courier/index.xhtml
@@ -7,25 +7,26 @@
     <h:body>
         <ui:composition template="/resources/template/template.xhtml">
             <ui:define name="content">
-                <div class="row">
-                    <div class="col-md-3">
-                        <h:form>
-                            <p:commandButton value="Collect Samples" ajax="false" action="#{courierController.navigateToCourierCollectSamples}" icon="fa fa-box" styleClass="p-button-secondary" />
-                            <p:commandButton value="Handover Samples to Lab" ajax="false" action="#{courierController.navigateToCourierHandoverSamplesToLab}" icon="fa fa-handshake" styleClass="p-button-secondary" />
-                            <p:commandButton value="View Reports" ajax="false" action="#{courierController.navigateToCourierViewReports}" icon="fa fa-file-alt" styleClass="p-button-secondary" />
-                            <p:commandButton value="Print Reports" ajax="false" action="#{courierController.navigateToCourierPrintReports}" icon="fa fa-print" styleClass="p-button-secondary" />
-                            <p:commandButton value="View Statistics" ajax="false" action="#{courierController.navigateToCourierViewStatistics}" icon="fa fa-chart-bar" styleClass="p-button-secondary" />
-                            <p:commandButton value="View Bill Reports" ajax="false" action="#{courierController.navigateToCourierViewBillReports}" icon="fa fa-receipt" styleClass="p-button-secondary" />
-                            <p:commandButton value="View Payment Reports" ajax="false" action="#{courierController.navigateToCourierViewPaymentReports}" icon="fa fa-money-bill-wave" styleClass="p-button-secondary" />
-                        </h:form>
-                    </div>
+                <div >
+                    <div class="row">
+                        <div class="col-2 p-1">
+                            <h:form>
+                                <p:commandButton value="Collect Samples" ajax="false" action="#{courierController.navigateToCourierCollectSamples}" icon="fa fa-box" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="Handover Samples to Lab" ajax="false" action="#{courierController.navigateToCourierHandoverSamplesToLab}" icon="fa fa-handshake" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="Patient Sample Status" ajax="false" action="#{courierController.navigateToCourierViewReports}" icon="fa fa-file-alt" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="Print Lab Reports" ajax="false" action="#{courierController.navigateToCourierPrintReports}" icon="fa fa-print" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="View Statistics" ajax="false" action="#{courierController.navigateToCourierViewStatistics}" icon="fa fa-chart-bar" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="View Bill Reports" ajax="false" action="#{courierController.navigateToCourierViewBillReports}" icon="fa fa-receipt" styleClass="p-button-secondary w-100 mb-2" />
+                                <p:commandButton value="View Payment Reports" ajax="false" action="#{courierController.navigateToCourierViewPaymentReports}" icon="fa fa-money-bill-wave" styleClass="p-button-secondary w-100 mb-2" />
+                            </h:form>
+                        </div>
 
-                    <div class="col-md-9">
-                        <ui:insert name="subcontent">
-                        </ui:insert>
+                        <div class="col-10 p-1">
+                            <ui:insert name="subcontent">
+                            </ui:insert>
+                        </div>
                     </div>
                 </div>
-
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/collecting_centre/courier/viewReports.xhtml b/src/main/webapp/collecting_centre/courier/viewReports.xhtml
index e0794bc4c8..c3a095a750 100644
--- a/src/main/webapp/collecting_centre/courier/viewReports.xhtml
+++ b/src/main/webapp/collecting_centre/courier/viewReports.xhtml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -16,9 +15,14 @@
 
                 <h:panelGroup rendered="#{webUserController.hasPrivilege('CourierCollectSamples')}" >
 
+                    <p:panel class="m-1 w-100">
+                        <f:facet name="header" >
+                            <i class="fa fa-file-alt"></i> View Reports
+                        </f:facet>
+
+                    </p:panel>
                     <div class="container">
-                        <h1><i class="fa fa-file-alt"></i> View Reports</h1>
-                        <p>Dummy content for View Reports page.</p>
+
                     </div>
 
                     <h:form>
@@ -46,16 +50,17 @@
                                         </p:datePicker>
                                         <h:outputLabel 
                                             class="form-label"
-                                            value="Department"/>
+                                            value="Department*"/>
                                         <p:selectOneMenu 
                                             value="#{searchController.institution}" 
                                             filter="true"
                                             filterMatchMode="true">
+                                            <f:selectItem itemLabel="All" ></f:selectItem>
                                             <f:selectItems 
                                                 value="#{sessionController.loggableCollectingCentres}"
-                                                var="cc" 
-                                                itemValue="#{cc}" 
-                                                itemLabel="#{cc.name}" >
+                                                var="cc1" 
+                                                itemValue="#{cc1}" 
+                                                itemLabel="#{cc1.name}" >
                                             </f:selectItems>
                                         </p:selectOneMenu>
 
@@ -101,307 +106,536 @@
 
                                 </div>
                                 <div class="col-md-10" >
+
                                     <p:dataTable  
                                         id="tblBills" 
                                         value="#{searchController.patientInvestigations}" 
                                         var="pi" 
                                         rowIndexVar="i" 
-                                        class="tbl table-condensed"
+                                        paginator="true"
+                                        rows="10"
+                                        
+                                        class="tbl table-condensed">
+
 
-                                        >
-                                        <p:column  headerText="Order No" style="width:8em;" >
+                                        <p:column headerText="Order No" style="width:8em;">
                                             <h:outputLabel id="lblBillNo" 
                                                            value="#{pi.billItem.bill.deptId}" 
-                                                           styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'redtext':''}"></h:outputLabel>
-                                            <p:tooltip for="lblBillNo"  >
-                                                <h:outputLabel value="Bill No : #{pi.billItem.bill.insId}" ></h:outputLabel>
+                                                           styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'redtext':''}" />
+                                            <p:tooltip for="lblBillNo">
+                                                <h:outputLabel value="Bill No : #{pi.billItem.bill.insId}" />
                                                 <br/>
-                                                <h:outputLabel value="Billed From : #{pi.billItem.bill.institution.name}" ></h:outputLabel>
+                                                <h:outputLabel value="Billed From : #{pi.billItem.bill.institution.name}" />
                                                 <br/>
                                                 <h:outputLabel value="Sampled : " />
-                                                <h:outputLabel rendered="#{pi.collected}" value="#{pi.sampledAt}" >
-                                                    <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                <h:outputLabel rendered="#{pi.collected}" value="#{pi.sampledAt}">
+                                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                                 </h:outputLabel>
                                                 <br/>
                                                 <h:outputLabel value="Received : " />
-                                                <h:outputLabel rendered="#{pi.received}" value="#{pi.receivedAt}" >
-                                                    <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                <h:outputLabel rendered="#{pi.received}" value="#{pi.receivedAt}">
+                                                    <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a" />
                                                 </h:outputLabel>
                                                 <br/>
-                                                <h:panelGroup rendered="#{pi.billItem.bill.cancelled}" >
+                                                <h:panelGroup rendered="#{pi.billItem.bill.cancelled}">
                                                     <h:outputLabel style="color: red;" value="Cancelled : " />
-                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.bill.cancelled}" value="#{pi.billItem.bill.cancelledBill.createdAt}" >
-                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.bill.cancelled}" value="#{pi.billItem.bill.cancelledBill.createdAt}">
+                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a" />
                                                     </h:outputLabel>
                                                 </h:panelGroup>
-                                                <h:panelGroup rendered="#{pi.billItem.refunded}" >
+                                                <h:panelGroup rendered="#{pi.billItem.refunded}">
                                                     <h:outputLabel style="color: red;" value="Refunded : " />
-                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.refunded}" value="#{pi.billItem.referanceBillItem.bill.createdAt}" >
-                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.refunded}" value="#{pi.billItem.referanceBillItem.bill.createdAt}">
+                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a" />
                                                     </h:outputLabel>
                                                 </h:panelGroup>
-
-
                                             </p:tooltip>
                                         </p:column>
 
-                                        <p:column  headerText="Dep ID" styleClass="alignTop" rendered="false" >
-                                            <h:outputLabel id="lblInvNo" 
-                                                           value="#{pi.billItem.bill.deptId}" 
-                                                           styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'redtext':''}"></h:outputLabel>
-                                            <p:tooltip for="lblBillNo"  >
-                                                <h:outputLabel value="Bill No : #{pi.billItem.bill.deptId}" ></h:outputLabel>
-                                                <br/>
-                                                <h:outputLabel value="Billed From : #{pi.billItem.bill.institution.name}" ></h:outputLabel>
-                                                <br/>
-                                                <h:outputLabel value="Sampled : " />
-                                                <h:outputLabel rendered="#{pi.collected}" value="#{pi.sampledAt}" >
-                                                    <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                                </h:outputLabel>
-                                                <br/>
-                                                <h:outputLabel value="Received : " />
-                                                <h:outputLabel rendered="#{pi.received}" value="#{pi.receivedAt}" >
-                                                    <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                                </h:outputLabel>
-                                                <br/>
-                                                <h:panelGroup rendered="#{pi.billItem.bill.cancelled}" >
-                                                    <h:outputLabel style="color: red;" value="Cancelled : " />
-                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.bill.cancelled}" value="#{pi.billItem.bill.cancelledBill.createdAt}" >
-                                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                                    </h:outputLabel>
-                                                </h:panelGroup>
-                                                <h:panelGroup rendered="#{pi.billItem.refunded eq true}" >
-                                                    <h:outputLabel style="color: red;" value="Refunded : " />
-                                                    <h:outputLabel style="color: red;" rendered="#{pi.billItem.refunded eq true}" value="#{pi.billItem.referanceBillItem.bill.createdAt}" >
-                                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                                    </h:outputLabel>
-                                                </h:panelGroup>
-                                            </p:tooltip>
+                                        <!-- Patient Column -->
+                                        <p:column headerText="Patient" styleClass="alignTop" style="width:14em;">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Name" />
+                                                    <p:outputLabel value="#{pi.billItem.bill.patient.person.name}" />
+                                                    <p:outputLabel value="Age" />
+                                                    <p:outputLabel value="#{pi.billItem.bill.patient.age}" />
+                                                    <p:outputLabel value="Sex" />
+                                                    <p:outputLabel value="#{pi.billItem.bill.patient.person.sex}" />
+                                                    <p:outputLabel value="Phone" />
+                                                    <p:outputLabel value="#{pi.billItem.bill.patient.person.phone}" />
+                                                </p:panelGrid>
+                                            </p:panel>
                                         </p:column>
 
-
-                                        <p:column  headerText="Patient" styleClass="alignTop" style="width:14em;">
-                                            <h:commandLink id="colPtDetail" rendered="#{webUserController.hasPrivilege('LabEditPatient') and pi.billItem.bill.approvedAnyTest}" 
-                                                           value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}" 
-                                                           action="#{patientController.navigateToOpdPatientEdit()}" 
-                                                           style="text-decoration:underline; max-width: 14em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;"
-                                                           styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'text-danger':''}"
-                                                           >
-                                                <f:setPropertyActionListener value="#{pi.billItem.bill.patient}" target="#{patientController.current}"/>
-                                                <f:setPropertyActionListener value="#{pi.billItem.bill}" target="#{billController.bill}"/>
-                                            </h:commandLink>
-
-                                            <h:commandLink id="colPtDetail1" rendered="#{!pi.billItem.bill.approvedAnyTest}"
-                                                           value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}" 
-                                                           action="#{patientController.navigateToOpdPatientEdit()}" 
-                                                           style="text-decoration:underline; max-width: 14em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;"
-                                                           styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'text-danger':''}"
-                                                           >
-                                                <f:setPropertyActionListener value="#{pi.billItem.bill.patient}" target="#{patientController.current}"/>
-                                                <f:setPropertyActionListener value="#{pi.billItem.bill}" target="#{billController.bill}"/>
-                                            </h:commandLink>
-
-                                            <p:outputLabel rendered="#{pi.billItem.bill.approvedAnyTest and !webUserController.hasPrivilege('LabEditPatient')}"
-                                                           value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}"
-                                                           style="max-width: 13em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;" 
-                                                           />
-
-                                            <p:tooltip for="colPtDetail"  >
-                                                <h:outputLabel value="Name : #{pi.billItem.bill.patient.person.name}" >
-                                                </h:outputLabel>
-                                                <br/>
-                                                <h:outputLabel value="Age : #{pi.billItem.bill.patient.age},&nbsp;#{pi.billItem.bill.patient.person.sex}," >
-                                                </h:outputLabel>
-                                                <br/>
-                                                <h:outputLabel value="Phone : #{pi.billItem.bill.patient.person.phone}" >
-                                                </h:outputLabel>
-                                            </p:tooltip>
+                                        <!-- Investigation Column -->
+                                        <p:column headerText="Investigation" styleClass="alignTop" style="width: 32em;">
+                                            <h:outputLabel value="#{pi.billItem.item.name}" />
                                         </p:column>
 
-                                        <p:column headerText="Investigation"  styleClass="alignTop" style="width: 32em;">
-                                            <h:outputLabel value="#{pi.billItem.item.name}" >
-                                            </h:outputLabel>
+                                        <!-- Collection Column -->
+                                        <p:column headerText="Collection">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.collected ? 'Collected' : 'Not Collected'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Collected at" />
+                                                    <p:outputLabel value="#{pi.sampledAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Collected by" />
+                                                    <p:outputLabel value="#{pi.sampleCollecter.name}" />
+                                                    <p:outputLabel value="Collected in Department" />
+                                                    <p:outputLabel value="#{pi.sampleDepartment.name}" />
+                                                    <p:outputLabel value="Collected in Institution" />
+                                                    <p:outputLabel value="#{pi.sampleInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.sampleComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
                                         </p:column>
 
-                                        <p:column rendered="#{configOptionApplicationController.getBooleanValueByKey('Allow Local Number For Opd Billing')}" headerText="Local Number"  styleClass="alignTop" style="width: 32em;">
-                                            <h:outputLabel value="#{pi.billItem.bill.localNumber}" >
-                                            </h:outputLabel>
+                                        <!-- Received Column -->
+                                        <p:column headerText="Received">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.received ? 'Received' : 'Not Received'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Received at" />
+                                                    <p:outputLabel value="#{pi.receivedAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Received by" />
+                                                    <p:outputLabel value="#{pi.receivedCollecter.name}" />
+                                                    <p:outputLabel value="Received in Department" />
+                                                    <p:outputLabel value="#{pi.receiveDepartment.name}" />
+                                                    <p:outputLabel value="Received in Institution" />
+                                                    <p:outputLabel value="#{pi.receiveInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.receiveComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
                                         </p:column>
 
-                                        <p:column  headerText="Actions" style="width: 11em;">
-                                            <p:commandLink process="btnSample" update="tblBills"
-                                                           disabled="#{pi.collected or pi.billItem.bill.cancelled}"   
-                                                           id="btnSample" 
-                                                           action="#{patientInvestigationController.markAsSampled}" >
-                                                <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
-                                                <p:graphicImage library="image" styleClass="standedicon" name="bleed.png" rendered="#{pi.collected ne true}"></p:graphicImage>
-                                                <p:graphicImage library="image" styleClass="standedicon" name="bleedok.jpg" rendered="#{pi.collected eq true}"></p:graphicImage>
-                                            </p:commandLink>
-                                            <h:panelGroup rendered="#{webUserController.hasPrivilege('LabSampleReceiving')}">
-                                                <p:commandLink process="btnReceive" update="tblBills"  disabled="#{pi.collected ne true}"   id="btnReceive"  action="#{patientInvestigationController.markAsReceived()}" >
-                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
-                                                    <p:graphicImage library="image" styleClass="standedicon" name="receive.jpeg" rendered="#{pi.received ne true }" ></p:graphicImage>
-                                                    <p:graphicImage library="image" styleClass="standedicon" name="receiveok.jpg" rendered="#{pi.received eq true}"></p:graphicImage>
-                                                </p:commandLink>
-                                            </h:panelGroup>
-
-                                            <h:panelGroup rendered="#{pi.billItem.bill.cancelled ne true}">
-                                                <p:commandLink ajax="false" id="btnPrintWorksheets" disabled="#{pi.received ne true}" action="/lab/single_worksheet?faces-redirect=true" >
-                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}" ></f:setPropertyActionListener>
-                                                    <p:graphicImage library="image" styleClass="standedicon" name="worksheet.gif" ></p:graphicImage>
-                                                </p:commandLink>
-                                            </h:panelGroup>
-
-                                            <p:commandLink id="btnNewReport" ajax="false" 
-                                                           disabled="#{!pi.received}" 
-                                                           action="/lab/patient_report?faces-redirect=true"  
-                                                           actionListener="#{patientReportController.createNewReport(pi)}" >
-                                                <f:setPropertyActionListener value="#{pi}" target="#{patientReportController.currentPtIx}"></f:setPropertyActionListener>
-                                                <p:graphicImage library="image" styleClass="standedicon" name="data_entry.png" ></p:graphicImage>
-                                            </p:commandLink>
-                                            <h:panelGroup >
-                                                <p:commandLink process="btnSms" update="tblBills"  
-                                                               id="btnSms" 
-                                                               rendered="#{!pi.billItem.bill.smsed}"
-                                                               disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund or pi.patientReports.size() eq 0}"
-                                                               action="#{patientInvestigationController.sendSms()}" >
-                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
-                                                    <p:graphicImage library="image" styleClass="standedicon" name="sms.jpg" ></p:graphicImage>
-                                                </p:commandLink>
-                                                <p:commandLink process="btnSmsSent" update="tblBills"  
-                                                               id="btnSmsSent"
-                                                               rendered="#{pi.billItem.bill.smsed}"
-                                                               disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund or pi.patientReports.size() eq 0}"
-                                                               action="#{patientInvestigationController.sendSms()}" >
-                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
-                                                    <p:graphicImage library="image" styleClass="standedicon" name="smssent.png" ></p:graphicImage>
-                                                </p:commandLink>
-
-                                            </h:panelGroup>
-
-                                            <p:tooltip for="btnReceive"  >
-                                                <h:outputLabel value="Receive Sample" rendered="#{!pi.received}" ></h:outputLabel>
-                                                <h:outputLabel value="Sample received at " rendered="#{pi.received}" ></h:outputLabel>
-                                                <h:outputLabel value="#{pi.receivedAt}" rendered="#{pi.received}" >
-                                                    <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
-                                                </h:outputLabel>
-                                            </p:tooltip>
-
-                                            <p:tooltip for="btnSample" value="Collect Sample" >
-                                                <h:outputLabel value="Collect Sample" rendered="#{!pi.collected }" ></h:outputLabel>
-                                                <h:outputLabel value="Sampled at " rendered="#{pi.collected}" ></h:outputLabel>
-                                                <h:outputLabel value="#{pi.sampledAt}" rendered="#{pi.collected}" >
-                                                    <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
-                                                </h:outputLabel>
-                                            </p:tooltip>
-
-                                            <p:tooltip for="btnNewReport" value="New Report" ></p:tooltip>
+                                        <!-- Performed Column -->
+                                        <p:column headerText="Performed">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.performed ? 'Performed' : 'Not Performed'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Performed at" />
+                                                    <p:outputLabel value="#{pi.performedAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Performed by" />
+                                                    <p:outputLabel value="#{pi.performedUser.name}" />
+                                                    <p:outputLabel value="Performed in Department" />
+                                                    <p:outputLabel value="#{pi.performDepartment.name}" />
+                                                    <p:outputLabel value="Performed in Institution" />
+                                                    <p:outputLabel value="#{pi.performInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.performComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
+                                        </p:column>
 
-                                            <p:tooltip for="btnPrintWorksheets" value="Print worksheet" ></p:tooltip>
+                                        <!-- Data Entry Column -->
+                                        <p:column headerText="Data Entry">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.dataEntered ? 'Data Entered' : 'Data Not Entered'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Data Entered at" />
+                                                    <p:outputLabel value="#{pi.dataEntryAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Data Entered by" />
+                                                    <p:outputLabel value="#{pi.dataEntryUser.name}" />
+                                                    <p:outputLabel value="Data Entry in Department" />
+                                                    <p:outputLabel value="#{pi.dataEntryDepartment.name}" />
+                                                    <p:outputLabel value="Data Entry in Institution" />
+                                                    <p:outputLabel value="#{pi.dataEntryInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.dataEntryComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
+                                        </p:column>
 
+                                        <!-- Approval Column -->
+                                        <p:column headerText="Approval">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.approved ? 'Approved' : 'Not Approved'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Approved at" />
+                                                    <p:outputLabel value="#{pi.approveAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Approved by" />
+                                                    <p:outputLabel value="#{pi.approveUser.name}" />
+                                                    <p:outputLabel value="Approved in Department" />
+                                                    <p:outputLabel value="#{pi.approveDepartment.name}" />
+                                                    <p:outputLabel value="Approved in Institution" />
+                                                    <p:outputLabel value="#{pi.approveInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.approveComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
+                                        </p:column>
 
-                                            <table >
-                                                <ui:repeat value="#{itemForItemController.getItemsForParentItem(pi.investigation)}" var="ifi"  >
-                                                    <tr>
-                                                        <td>
-                                                            <p:commandLink disabled="#{!pi.received}" value="New #{ifi.name}" actionListener="#{patientReportController.enterNewReportFormat(pi, ifi)}" action="/lab/patient_report?faces-redirect=true" 
-                                                                           ajax="false">
-                                                            </p:commandLink>
-                                                        </td>
-                                                    </tr>
-                                                </ui:repeat>
-                                            </table>
+                                        <!-- Printing Column -->
+                                        <p:column headerText="Printing">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.printed ? 'Printed' : 'Not Printed'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Printed at" />
+                                                    <p:outputLabel value="#{pi.printingAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Printed by" />
+                                                    <p:outputLabel value="#{pi.printingUser.name}" />
+                                                    <p:outputLabel value="Printed in Department" />
+                                                    <p:outputLabel value="#{pi.printingDepartment.name}" />
+                                                    <p:outputLabel value="Printed in Institution" />
+                                                    <p:outputLabel value="#{pi.printingInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.printingComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
+                                        </p:column>
 
+                                        <!-- Cancellation Column -->
+                                        <p:column headerText="Cancellation">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.cancelled ? 'Cancelled' : 'Not Cancelled'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Cancelled at" />
+                                                    <p:outputLabel value="#{pi.cancelledAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Cancelled by" />
+                                                    <p:outputLabel value="#{pi.cancelledUser.name}" />
+                                                    <p:outputLabel value="Cancelled in Department" />
+                                                    <p:outputLabel value="#{pi.cancellDepartment.name}" />
+                                                    <p:outputLabel value="Cancelled in Institution" />
+                                                    <p:outputLabel value="#{pi.cancellInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.cancellComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
+                                        </p:column>
 
+                                        <!-- Return Column -->
+                                        <p:column headerText="Return">
+                                            <p:panel collapsed="true" toggleable="true">
+                                                <f:facet name="header">
+                                                    <h:outputLabel value="#{pi.returned ? 'Returned' : 'Not Returned'}" />
+                                                </f:facet>
+                                                <p:panelGrid columns="2">
+                                                    <p:outputLabel value="Returned at" />
+                                                    <p:outputLabel value="#{pi.returnedAt}">
+                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                    </p:outputLabel>
+                                                    <p:outputLabel value="Returned by" />
+                                                    <p:outputLabel value="#{pi.returnedUser.name}" />
+                                                    <p:outputLabel value="Returned in Department" />
+                                                    <p:outputLabel value="#{pi.returnDepartment.name}" />
+                                                    <p:outputLabel value="Returned in Institution" />
+                                                    <p:outputLabel value="#{pi.returnInstitution.name}" />
+                                                    <p:outputLabel value="Comments" />
+                                                    <p:outputLabel value="#{pi.returnComments}" />
+                                                </p:panelGrid>
+                                            </p:panel>
                                         </p:column>
 
-                                        <p:column headerText="Data-Entered Reports" 
-                                                  style="width:11em;" >
-
-
-
-                                            <ui:repeat value="#{patientReportController.patientReports(pi)}" var="dpr">
-                                                <div class="#{dpr.retired eq true ? 'noDisplayRow':''}">
-
-                                                    <p:commandLink id="cmdOldReport" 
-                                                                   value="#{dpr.item.name}" 
-                                                                   rendered="#{dpr.item ne pi.billItem.item}"
-                                                                   ajax="false" action="/lab/patient_report?faces-redirect=true">
-                                                        <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
-                                                    </p:commandLink>
-
-                                                    <p:commandLink id="cmdOldReportEdit" ajax="false" action="/lab/patient_report?faces-redirect=true">
-                                                        <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
-                                                        <p:graphicImage library="image" styleClass="standedicon" name="data_entry.png" ></p:graphicImage>
-                                                    </p:commandLink>
-
-                                                    <p:commandLink id="cmdOldReportPrint1" ajax="false" action="/lab/patient_report_print?faces-redirect=true" disabled="#{!dpr.approved}" rendered="#{!sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}">
-                                                        <p:graphicImage library="image" name="print.jpg" styleClass="standedicon" ></p:graphicImage>
-                                                        <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
-                                                    </p:commandLink>
-                                                    <p:commandLink id="cmdOldReportPrint2" ajax="false" action="/lab/patient_report_print?faces-redirect=true" disabled="#{!dpr.approved or dpr.patientInvestigation.billItem.bill.backwardReferenceBill.balance ne 0}" rendered="#{sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}">
-                                                        <p:graphicImage library="image" name="print.jpg" styleClass="standedicon" ></p:graphicImage>
-                                                        <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
-                                                    </p:commandLink>
-
-                                                    <p:graphicImage id="imgApproved" library="image" name="approved_icon.png" 
-                                                                    style="height: 30px; width: 30px; #{dpr.approved ? '':'opacity: 0.1;'}" ></p:graphicImage>
-                                                    <p:graphicImage id="imgPrinted" library="image" name="print_ok.png" 
-                                                                    style="height: 30px; width: 30px;#{dpr.printed ? '':'opacity: 0.1;'}" ></p:graphicImage>
-                                                    <p:commandLink ajax="false"  
-                                                                   id="btnEmail" 
-                                                                   disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund}"
-                                                                   action="#{patientReportController.sendEmail()}" >
-                                                        <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
-                                                        <p:graphicImage library="image" styleClass="standedicon" name="email.jpg" ></p:graphicImage>
-                                                    </p:commandLink>
-
-
-                                                    <!-- all tooltips -->
-                                                    <p:tooltip for="imgApproved" >
-                                                        <h:outputLabel value="Approved" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
-                                                        </h:outputLabel>
-                                                    </p:tooltip>
-                                                    <p:tooltip for="imgPrinted" >
-                                                        <h:outputLabel value="Printed" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
-                                                        </h:outputLabel>
-                                                    </p:tooltip>
-                                                    <p:tooltip for="cmdOldReportPrint1 cmdOldReportPrint2" >
-                                                        <h:outputLabel value="To Print" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
-                                                        </h:outputLabel>
-                                                    </p:tooltip>
-                                                    <p:tooltip for="cmdOldReport cmdOldReportEdit" >
-                                                        <h:outputLabel value="To Edit, Approve or Print" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
-                                                        </h:outputLabel>
-                                                        <br/>
-                                                        <h:outputLabel value="#{dpr.item.name}" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
-                                                        </h:outputLabel>
-                                                        <br/>
-                                                        <h:outputLabel value="Data entered at " ></h:outputLabel>
-                                                        <h:outputLabel value="#{dpr.dataEntryAt}" >
-                                                            <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
-                                                        </h:outputLabel>
-                                                        <br/>
-                                                        <h:outputLabel value="Approved at " rendered="#{dpr.approved}" ></h:outputLabel>
-                                                        <h:outputLabel value="#{dpr.approveAt}"  rendered="#{dpr.approved}" >
-                                                            <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
-                                                        </h:outputLabel>
-                                                        <br/>
-                                                        <h:outputLabel value="Printed at "  rendered="#{dpr.printed}" ></h:outputLabel>
-                                                        <h:outputLabel value="#{dpr.printingAt}"  rendered="#{dpr.printed}" >
-                                                            <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
-                                                        </h:outputLabel>
-                                                    </p:tooltip>
-
-                                                </div>
-                                                <p:badge value="Printed" severity="info" rendered="#{pi.printed}" ></p:badge>
-                                            </ui:repeat>
+                                    </p:dataTable>
 
 
 
-                                        </p:column>
 
-                                    </p:dataTable>
+
+                                    <!--                                    <p:dataTable  
+                                                                            id="tblBills" 
+                                                                            value="#{searchController.patientInvestigations}" 
+                                                                            var="pi" 
+                                                                            rowIndexVar="i" 
+                                                                            class="tbl table-condensed"
+                                    
+                                                                            >
+                                                                           
+                                                                            <p:column  headerText="Order No" style="width:8em;" >
+                                                                                <h:outputLabel id="lblBillNo" 
+                                                                                               value="#{pi.billItem.bill.deptId}" 
+                                                                                               styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'redtext':''}"></h:outputLabel>
+                                                                                <p:tooltip for="lblBillNo"  >
+                                                                                    <h:outputLabel value="Bill No : #{pi.billItem.bill.insId}" ></h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:outputLabel value="Billed From : #{pi.billItem.bill.institution.name}" ></h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:outputLabel value="Sampled : " />
+                                                                                    <h:outputLabel rendered="#{pi.collected}" value="#{pi.sampledAt}" >
+                                                                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
+                                                                                    </h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:outputLabel value="Received : " />
+                                                                                    <h:outputLabel rendered="#{pi.received}" value="#{pi.receivedAt}" >
+                                                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                    </h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:panelGroup rendered="#{pi.billItem.bill.cancelled}" >
+                                                                                        <h:outputLabel style="color: red;" value="Cancelled : " />
+                                                                                        <h:outputLabel style="color: red;" rendered="#{pi.billItem.bill.cancelled}" value="#{pi.billItem.bill.cancelledBill.createdAt}" >
+                                                                                            <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                        </h:outputLabel>
+                                                                                    </h:panelGroup>
+                                                                                    <h:panelGroup rendered="#{pi.billItem.refunded}" >
+                                                                                        <h:outputLabel style="color: red;" value="Refunded : " />
+                                                                                        <h:outputLabel style="color: red;" rendered="#{pi.billItem.refunded}" value="#{pi.billItem.referanceBillItem.bill.createdAt}" >
+                                                                                            <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                        </h:outputLabel>
+                                                                                    </h:panelGroup>
+                                    
+                                    
+                                                                                </p:tooltip>
+                                                                            </p:column>
+                                    
+                                                                       
+                                    
+                                    
+                                                                            <p:column  headerText="Patient" styleClass="alignTop" style="width:14em;">
+                                                                                <h:commandLink id="colPtDetail" rendered="#{webUserController.hasPrivilege('LabEditPatient') and pi.billItem.bill.approvedAnyTest}" 
+                                                                                               value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}" 
+                                                                                               action="#{patientController.navigateToOpdPatientEdit()}" 
+                                                                                               style="text-decoration:underline; max-width: 14em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;"
+                                                                                               styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'text-danger':''}"
+                                                                                               >
+                                                                                    <f:setPropertyActionListener value="#{pi.billItem.bill.patient}" target="#{patientController.current}"/>
+                                                                                    <f:setPropertyActionListener value="#{pi.billItem.bill}" target="#{billController.bill}"/>
+                                                                                </h:commandLink>
+                                    
+                                                                                <h:commandLink id="colPtDetail1" rendered="#{!pi.billItem.bill.approvedAnyTest}"
+                                                                                               value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}" 
+                                                                                               action="#{patientController.navigateToOpdPatientEdit()}" 
+                                                                                               style="text-decoration:underline; max-width: 14em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;"
+                                                                                               styleClass="#{pi.billItem.bill.cancelled or pi.billItem.transRefund ? 'text-danger':''}"
+                                                                                               >
+                                                                                    <f:setPropertyActionListener value="#{pi.billItem.bill.patient}" target="#{patientController.current}"/>
+                                                                                    <f:setPropertyActionListener value="#{pi.billItem.bill}" target="#{billController.bill}"/>
+                                                                                </h:commandLink>
+                                    
+                                                                                <p:outputLabel rendered="#{pi.billItem.bill.approvedAnyTest and !webUserController.hasPrivilege('LabEditPatient')}"
+                                                                                               value="#{pi.billItem.bill.patient.person.name}, #{pi.billItem.bill.patient.age}"
+                                                                                               style="max-width: 13em; overflow: hidden; text-overflow: ellipsis; display: inline-block; white-space: nowrap;" 
+                                                                                               />
+                                    
+                                                                                <p:tooltip for="colPtDetail"  >
+                                                                                    <h:outputLabel value="Name : #{pi.billItem.bill.patient.person.name}" >
+                                                                                    </h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:outputLabel value="Age : #{pi.billItem.bill.patient.age},&nbsp;#{pi.billItem.bill.patient.person.sex}," >
+                                                                                    </h:outputLabel>
+                                                                                    <br/>
+                                                                                    <h:outputLabel value="Phone : #{pi.billItem.bill.patient.person.phone}" >
+                                                                                    </h:outputLabel>
+                                                                                </p:tooltip>
+                                                                            </p:column>
+                                    
+                                                                            <p:column headerText="Investigation"  styleClass="alignTop" style="width: 32em;">
+                                                                                <h:outputLabel value="#{pi.billItem.item.name}" >
+                                                                                </h:outputLabel>
+                                                                            </p:column>
+                                    
+                                                                            <p:column rendered="#{configOptionApplicationController.getBooleanValueByKey('Allow Local Number For Opd Billing')}" headerText="Local Number"  styleClass="alignTop" style="width: 32em;">
+                                                                                <h:outputLabel value="#{pi.billItem.bill.localNumber}" >
+                                                                                </h:outputLabel>
+                                                                            </p:column>
+                                    
+                                                                            <p:column  headerText="Actions" style="width: 11em;">
+                                                                                <p:commandLink process="btnSample" update="tblBills"
+                                                                                               disabled="#{pi.collected or pi.billItem.bill.cancelled}"   
+                                                                                               id="btnSample" 
+                                                                                               action="#{patientInvestigationController.markAsSampled}" >
+                                                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
+                                                                                    <p:graphicImage library="image" styleClass="standedicon" name="bleed.png" rendered="#{pi.collected ne true}"></p:graphicImage>
+                                                                                    <p:graphicImage library="image" styleClass="standedicon" name="bleedok.jpg" rendered="#{pi.collected eq true}"></p:graphicImage>
+                                                                                </p:commandLink>
+                                                                                <h:panelGroup rendered="#{webUserController.hasPrivilege('LabSampleReceiving')}">
+                                                                                    <p:commandLink process="btnReceive" update="tblBills"  disabled="#{pi.collected ne true}"   id="btnReceive"  action="#{patientInvestigationController.markAsReceived()}" >
+                                                                                        <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
+                                                                                        <p:graphicImage library="image" styleClass="standedicon" name="receive.jpeg" rendered="#{pi.received ne true }" ></p:graphicImage>
+                                                                                        <p:graphicImage library="image" styleClass="standedicon" name="receiveok.jpg" rendered="#{pi.received eq true}"></p:graphicImage>
+                                                                                    </p:commandLink>
+                                                                                </h:panelGroup>
+                                    
+                                                                                <h:panelGroup rendered="#{pi.billItem.bill.cancelled ne true}">
+                                                                                    <p:commandLink ajax="false" id="btnPrintWorksheets" disabled="#{pi.received ne true}" action="/lab/single_worksheet?faces-redirect=true" >
+                                                                                        <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}" ></f:setPropertyActionListener>
+                                                                                        <p:graphicImage library="image" styleClass="standedicon" name="worksheet.gif" ></p:graphicImage>
+                                                                                    </p:commandLink>
+                                                                                </h:panelGroup>
+                                    
+                                                                                <p:commandLink id="btnNewReport" ajax="false" 
+                                                                                               disabled="#{!pi.received}" 
+                                                                                               action="/lab/patient_report?faces-redirect=true"  
+                                                                                               actionListener="#{patientReportController.createNewReport(pi)}" >
+                                                                                    <f:setPropertyActionListener value="#{pi}" target="#{patientReportController.currentPtIx}"></f:setPropertyActionListener>
+                                                                                    <p:graphicImage library="image" styleClass="standedicon" name="data_entry.png" ></p:graphicImage>
+                                                                                </p:commandLink>
+                                                                                <h:panelGroup >
+                                                                                    <p:commandLink process="btnSms" update="tblBills"  
+                                                                                                   id="btnSms" 
+                                                                                                   rendered="#{!pi.billItem.bill.smsed}"
+                                                                                                   disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund or pi.patientReports.size() eq 0}"
+                                                                                                   action="#{patientInvestigationController.sendSms()}" >
+                                                                                        <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
+                                                                                        <p:graphicImage library="image" styleClass="standedicon" name="sms.jpg" ></p:graphicImage>
+                                                                                    </p:commandLink>
+                                                                                    <p:commandLink process="btnSmsSent" update="tblBills"  
+                                                                                                   id="btnSmsSent"
+                                                                                                   rendered="#{pi.billItem.bill.smsed}"
+                                                                                                   disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund or pi.patientReports.size() eq 0}"
+                                                                                                   action="#{patientInvestigationController.sendSms()}" >
+                                                                                        <f:setPropertyActionListener value="#{pi}" target="#{patientInvestigationController.current}"></f:setPropertyActionListener>
+                                                                                        <p:graphicImage library="image" styleClass="standedicon" name="smssent.png" ></p:graphicImage>
+                                                                                    </p:commandLink>
+                                    
+                                                                                </h:panelGroup>
+                                    
+                                                                                <p:tooltip for="btnReceive"  >
+                                                                                    <h:outputLabel value="Receive Sample" rendered="#{!pi.received}" ></h:outputLabel>
+                                                                                    <h:outputLabel value="Sample received at " rendered="#{pi.received}" ></h:outputLabel>
+                                                                                    <h:outputLabel value="#{pi.receivedAt}" rendered="#{pi.received}" >
+                                                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                    </h:outputLabel>
+                                                                                </p:tooltip>
+                                    
+                                                                                <p:tooltip for="btnSample" value="Collect Sample" >
+                                                                                    <h:outputLabel value="Collect Sample" rendered="#{!pi.collected }" ></h:outputLabel>
+                                                                                    <h:outputLabel value="Sampled at " rendered="#{pi.collected}" ></h:outputLabel>
+                                                                                    <h:outputLabel value="#{pi.sampledAt}" rendered="#{pi.collected}" >
+                                                                                        <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                    </h:outputLabel>
+                                                                                </p:tooltip>
+                                    
+                                                                                <p:tooltip for="btnNewReport" value="New Report" ></p:tooltip>
+                                    
+                                                                                <p:tooltip for="btnPrintWorksheets" value="Print worksheet" ></p:tooltip>
+                                    
+                                    
+                                                                                <table >
+                                                                                    <ui:repeat value="#{itemForItemController.getItemsForParentItem(pi.investigation)}" var="ifi"  >
+                                                                                        <tr>
+                                                                                            <td>
+                                                                                                <p:commandLink disabled="#{!pi.received}" value="New #{ifi.name}" actionListener="#{patientReportController.enterNewReportFormat(pi, ifi)}" action="/lab/patient_report?faces-redirect=true" 
+                                                                                                               ajax="false">
+                                                                                                </p:commandLink>
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    </ui:repeat>
+                                                                                </table>
+                                    
+                                    
+                                                                            </p:column>
+                                    
+                                                                            <p:column headerText="Data-Entered Reports" 
+                                                                                      style="width:11em;" >
+                                    
+                                    
+                                    
+                                                                                <ui:repeat value="#{patientReportController.patientReports(pi)}" var="dpr">
+                                                                                    <div class="#{dpr.retired eq true ? 'noDisplayRow':''}">
+                                    
+                                                                                        <p:commandLink id="cmdOldReport" 
+                                                                                                       value="#{dpr.item.name}" 
+                                                                                                       rendered="#{dpr.item ne pi.billItem.item}"
+                                                                                                       ajax="false" action="/lab/patient_report?faces-redirect=true">
+                                                                                            <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
+                                                                                        </p:commandLink>
+                                    
+                                                                                        <p:commandLink id="cmdOldReportEdit" ajax="false" action="/lab/patient_report?faces-redirect=true">
+                                                                                            <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
+                                                                                            <p:graphicImage library="image" styleClass="standedicon" name="data_entry.png" ></p:graphicImage>
+                                                                                        </p:commandLink>
+                                    
+                                                                                        <p:commandLink id="cmdOldReportPrint1" ajax="false" action="/lab/patient_report_print?faces-redirect=true" disabled="#{!dpr.approved}" rendered="#{!sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}">
+                                                                                            <p:graphicImage library="image" name="print.jpg" styleClass="standedicon" ></p:graphicImage>
+                                                                                            <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
+                                                                                        </p:commandLink>
+                                                                                        <p:commandLink id="cmdOldReportPrint2" ajax="false" action="/lab/patient_report_print?faces-redirect=true" disabled="#{!dpr.approved or dpr.patientInvestigation.billItem.bill.backwardReferenceBill.balance ne 0}" rendered="#{sessionController.departmentPreference.partialPaymentOfOpdBillsAllowed}">
+                                                                                            <p:graphicImage library="image" name="print.jpg" styleClass="standedicon" ></p:graphicImage>
+                                                                                            <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
+                                                                                        </p:commandLink>
+                                    
+                                                                                        <p:graphicImage id="imgApproved" library="image" name="approved_icon.png" 
+                                                                                                        style="height: 30px; width: 30px; #{dpr.approved ? '':'opacity: 0.1;'}" ></p:graphicImage>
+                                                                                        <p:graphicImage id="imgPrinted" library="image" name="print_ok.png" 
+                                                                                                        style="height: 30px; width: 30px;#{dpr.printed ? '':'opacity: 0.1;'}" ></p:graphicImage>
+                                                                                        <p:commandLink ajax="false"  
+                                                                                                       id="btnEmail" 
+                                                                                                       disabled="#{pi.billItem.bill.cancelled or pi.billItem.transRefund}"
+                                                                                                       action="#{patientReportController.sendEmail()}" >
+                                                                                            <f:setPropertyActionListener value="#{dpr}" target="#{patientReportController.currentPatientReport}"></f:setPropertyActionListener>
+                                                                                            <p:graphicImage library="image" styleClass="standedicon" name="email.jpg" ></p:graphicImage>
+                                                                                        </p:commandLink>
+                                    
+                                    
+                                                                                         all tooltips 
+                                                                                        <p:tooltip for="imgApproved" >
+                                                                                            <h:outputLabel value="Approved" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
+                                                                                            </h:outputLabel>
+                                                                                        </p:tooltip>
+                                                                                        <p:tooltip for="imgPrinted" >
+                                                                                            <h:outputLabel value="Printed" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
+                                                                                            </h:outputLabel>
+                                                                                        </p:tooltip>
+                                                                                        <p:tooltip for="cmdOldReportPrint1 cmdOldReportPrint2" >
+                                                                                            <h:outputLabel value="To Print" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
+                                                                                            </h:outputLabel>
+                                                                                        </p:tooltip>
+                                                                                        <p:tooltip for="cmdOldReport cmdOldReportEdit" >
+                                                                                            <h:outputLabel value="To Edit, Approve or Print" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
+                                                                                            </h:outputLabel>
+                                                                                            <br/>
+                                                                                            <h:outputLabel value="#{dpr.item.name}" styleClass="#{dpr.approved ? 'greentext':'yellowtext'}" >
+                                                                                            </h:outputLabel>
+                                                                                            <br/>
+                                                                                            <h:outputLabel value="Data entered at " ></h:outputLabel>
+                                                                                            <h:outputLabel value="#{dpr.dataEntryAt}" >
+                                                                                                <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                            </h:outputLabel>
+                                                                                            <br/>
+                                                                                            <h:outputLabel value="Approved at " rendered="#{dpr.approved}" ></h:outputLabel>
+                                                                                            <h:outputLabel value="#{dpr.approveAt}"  rendered="#{dpr.approved}" >
+                                                                                                <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                            </h:outputLabel>
+                                                                                            <br/>
+                                                                                            <h:outputLabel value="Printed at "  rendered="#{dpr.printed}" ></h:outputLabel>
+                                                                                            <h:outputLabel value="#{dpr.printingAt}"  rendered="#{dpr.printed}" >
+                                                                                                <f:convertDateTime pattern="dd/MMM/yyyy - hh:mm a"/>
+                                                                                            </h:outputLabel>
+                                                                                        </p:tooltip>
+                                    
+                                                                                    </div>
+                                                                                    <p:badge value="Printed" severity="info" rendered="#{pi.printed}" ></p:badge>
+                                                                                </ui:repeat>
+                                    
+                                    
+                                    
+                                                                            </p:column>
+                                    
+                                                                        </p:dataTable>-->
                                 </div>
 
 

From f47fdebe9ed2c1c9fda26e414b33d00d32c53b41 Mon Sep 17 00:00:00 2001
From: buddhika75 <buddhika.ari@gmail.com>
Date: Sun, 4 Aug 2024 09:33:07 +0530
Subject: [PATCH 3/3] Closes #6612 Signed-off-by: buddhika75
 <buddhika.ari@gmail.com>

---
 src/main/webapp/lab/sample_management.xhtml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/webapp/lab/sample_management.xhtml b/src/main/webapp/lab/sample_management.xhtml
index 5b7d390d26..f1259b0082 100644
--- a/src/main/webapp/lab/sample_management.xhtml
+++ b/src/main/webapp/lab/sample_management.xhtml
@@ -173,13 +173,9 @@
                                                     action="#{patientInvestigationController.navigateToPrintBarcodesFromSampellingPage(smpIx)}"
                                                     >
                                                 </p:commandButton>
-
                                             </div>
-
                                         </p:column>
-
                                     </p:dataTable>
-
                                 </h:panelGroup>
                             </div>
                         </div>