Skip to content

Commit

Permalink
Merge pull request #6563 from hmislk/Issue#6559
Browse files Browse the repository at this point in the history 
Issue#6559 Closes #6559
  • Loading branch information
@Irani96
Irani96 authored Jul 25, 2024
2 parents 0e505c4 + a767eb6 commit c6d71e6
Show file tree
Hide file tree
Showing 11 changed files with 314 additions and 72 deletions.
25 changes: 24 additions & 1 deletion src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
20 changes: 20 additions & 0 deletions src/main/webapp/lab/accept_samples.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 20 additions & 0 deletions src/main/webapp/lab/collect_samples.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 20 additions & 0 deletions src/main/webapp/lab/divide_samples.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
19 changes: 19 additions & 0 deletions src/main/webapp/lab/generate_barcodes_for_lab.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 20 additions & 0 deletions src/main/webapp/lab/reject_samples.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 20 additions & 0 deletions src/main/webapp/lab/revert_samples.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
85 changes: 85 additions & 0 deletions src/main/webapp/lab/sample_at_lab_index.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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>
53 changes: 26 additions & 27 deletions src/main/webapp/lab/sample_index.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
13 changes: 13 additions & 0 deletions src/main/webapp/lab/sent_to_lab.xhtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:composition template="/lab/sample_index.xhtml">
<ui:define name="subcontent">
<h:panelGrid>
<h:outputLabel value="sent to lab"></h:outputLabel>
</h:panelGrid>
</ui:define>
</ui:composition>
</html>
Loading

0 comments on commit c6d71e6

Please sign in to comment.