Merge branch 'master' into Issue#6425

hmislk · Jul 26, 2024 · 5a96f61 · 5a96f61
2 parents 3bfdbe5 + 005ad37
commit 5a96f61
Show file tree

Hide file tree

Showing 19 changed files with 330 additions and 84 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-1
+6
diff --git a/.github/last_date.txt b/.github/last_date.txt
@@ -1 +1 @@
-20240723
+20240725
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 
 
-Current Version: 3.0.0.20240723.1 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240725.6 (This line will be automatically updated to reflect the latest version)
 
 
 ## History

diff --git a/pom.xml b/pom.xml
@@ -2,11 +2,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
-
-    <artifactId>sethmademo</artifactId>
+  
+    <artifactId>vfs</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
-    <name>sethmademo</name>
+    <name>vfs</name>
 
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
@@ -1134,7 +1134,30 @@ public String navigateToCollelcted() {
         listPatientInvestigationsWhereSamplingCompleting();
         return "/lab/patient_investigations_collected?faces-redirect=true";
     }
-
+    public String navigateToSentToLab(){
+        return "/lab/sent_to_lab?faces-redirect=true";
+    }
+
+//  Navigation Lab sampling at lab for barcode generate page
+    public String navigateToGenerateBarcodesForLab(){
+        return "/lab/generate_barcodes_for_lab?faces-redirect=true";
+    }
+
+    public String navigateToCollectSamples(){
+        return "/lab/collect_samples?faces-redirect=true";
+    }
+    public String navigateToAcceptSamples(){
+        return "/lab/accept_samples?faces-redirect=true";
+    }
+    public String navigateToRejectSamples(){
+        return "/lab/reject_samples?faces-redirect=true";
+    }
+    public String navigateToRevertSamples(){
+        return "/lab/revert_samples?faces-redirect=true";
+    }
+    public String navigateToDivideSamples(){
+        return "/lab/divide_samples?faces-redirect=true";
+    }
     public void prepareToSample() {
         String temSql;
         Map temMap = new HashMap();

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,17 +2,19 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/demos</jta-data-source>
+        <jta-data-source>jdbc/hims</jta-data-source>
+
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/demoaudit</jta-data-source>
+
+        <jta-data-source>jdbc/himsAduit</jta-data-source>
+
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>
     </persistence-unit>
-
 </persistence>
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240720.4
+3.0.0.20240725.6
diff --git 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>/sethmademo</context-root>
+  <context-root>/vfs</context-root>
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

diff --git a/src/main/webapp/lab/accept_samples.xhtml b/src/main/webapp/lab/accept_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Accept"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/collect_samples.xhtml b/src/main/webapp/lab/collect_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Collect Samples"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/divide_samples.xhtml b/src/main/webapp/lab/divide_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Divide"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/generate_barcodes_for_lab.xhtml b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Generate Barcodes for lab"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/reject_samples.xhtml b/src/main/webapp/lab/reject_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Reject"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/revert_samples.xhtml b/src/main/webapp/lab/revert_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Revert"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/sample_at_lab_index.xhtml b/src/main/webapp/lab/sample_at_lab_index.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <h:body>
+        <ui:composition template="/resources/template/template.xhtml">
+            <ui:define name="content">
+                <p:panel header="Sample Management at Lab">
+                    <div class="row"> 
+                        <div class="col-2" id="first-column"> 
+                            <h:form>
+                                <div class="d-grid gap-2">
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false"
+                                        value="Generate Barcodes for lab" 
+                                        icon="fa fa-barcode"
+                                        action="#{patientInvestigationController.navigateToGenerateBarcodesForLab()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        value="Collect Samples" 
+                                        icon="fa fa-vial"
+                                        action="#{patientInvestigationController.navigateToCollectSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton
+                                        style="float: right;"
+                                        class="w-100 my-1"
+                                        icon="fa fa-check"
+                                        value="Accept Samples" 
+                                        ajax="false" 
+                                        action="#{patientInvestigationController.navigateToAcceptSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1"  
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Reject Samples"
+                                        icon="fa fa-times"
+                                        action="#{patientInvestigationController.navigateToRejectSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Revert Samples"
+                                        icon="fa fa-undo"
+                                        action="#{patientInvestigationController.navigateToRevertSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Divide Samples"
+                                        icon="fa fa-cut"
+                                        action="#{patientInvestigationController.navigateToDivideSamples()}"
+                                        >
+                                    </p:commandButton>
+                                </div>
+                            </h:form>
+                        </div>
+                        <div id="second-column" class="col-9"> 
+                            <ui:insert name="subcontent" >
+
+                            </ui:insert>
+                        </div>
+                    </div>                   
+                </p:panel>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/sample_index.xhtml b/src/main/webapp/lab/sample_index.xhtml
@@ -7,62 +7,61 @@
     <h:body>
         <ui:composition template="/resources/template/template.xhtml">
             <ui:define name="content">
-                <p:panel header="Sample Management">
+                <p:panel header="Sample Management at Phlebotomy Room">
                     <div class="row"> 
                         <div class="col-3" id="first-column"> 
                             <h:form>
                                 <div class="d-grid gap-2">
                                     <p:commandButton 
                                         class="w-100" 
                                         ajax="false"
-                                        value="To Collect Samples" 
+                                        value="Generate Barcode for Phlebotomy Room" 
+                                        icon="fa fa-barcode"
                                         action="#{patientInvestigationController.navigateToToCollelct()}" 
                                         >
                                     </p:commandButton>
                                     <p:commandButton 
                                         class="w-100" 
                                         ajax="false" 
                                         value="Collected Samples" 
-                                        action="#{patientInvestigationController.navigateToCollelcted()}" />
-                                    <p:commandButton
-                                        style="float: right;"
-                                        class="ui-button-warning"
-                                        icon="fa fa-barcode"
-                                        value="To Barcode Printing" 
-                                        ajax="false" 
-                                        action="#{patientInvestigationController.navigateToPrintBarcodeFromMenu}" >
+                                        icon="fa fa-vials"
+                                        action="#{patientInvestigationController.navigateToCollelcted()}">
                                     </p:commandButton>
-                                    <p:commandButton 
-                                        class="w-100 my-1" 
-                                        id="btnToListSamples" 
+                                    <p:commandButton
+                                        class="w-100" 
                                         ajax="false" 
-                                        immediate="true"
-                                        action="#{patientSampleController.navigateToListPatientSamples()}" 
-                                        value="To List Samples"   >
+                                        value="Sent to Lab" 
+                                        icon="fa fa-flask"
+                                        action="#{patientInvestigationController.navigateToSentToLab()}">
                                     </p:commandButton>
-                                </div>
-
 
+                                    <!--                                    <p:commandButton
+                                                                            style="float: right;"
+                                                                            class="ui-button-warning w-100"
+                                                                            value="To Barcode Printing" 
+                                                                            ajax="false" 
+                                                                            action="#{patientInvestigationController.navigateToPrintBarcodeFromMenu}" >
+                                                                        </p:commandButton>
+                                                                        <p:commandButton 
+                                                                            class="w-100 my-1" 
+                                                                            id="btnToListSamples" 
+                                                                            ajax="false" 
+                                                                            immediate="true"
+                                                                            action="#{patientSampleController.navigateToListPatientSamples()}" 
+                                                                            value="To List Samples"   >
+                                                                        </p:commandButton>-->
+                                </div>
                             </h:form>
                         </div>
 
-
-
                         <div id="second-column" class="col-9"> 
                             <ui:insert name="subcontent" >
 
                             </ui:insert>
                         </div>
-
                     </div>
                 </p:panel>
-
-
-
             </ui:define>
-
-
         </ui:composition>
-
     </h:body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio



		Current Version: 3.0.0.20240723.1 (This line will be automatically updated to reflect the latest version)
		Current Version: 3.0.0.20240725.6 (This line will be automatically updated to reflect the latest version)


		## History
Expand Down