diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
index ca68b449ee..462602c82e 100644
--- 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/webapp/lab/accept_samples.xhtml b/src/main/webapp/lab/accept_samples.xhtml
new file mode 100644
index 0000000000..8103a6d806
--- /dev/null
+++ b/src/main/webapp/lab/accept_samples.xhtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/collect_samples.xhtml b/src/main/webapp/lab/collect_samples.xhtml
new file mode 100644
index 0000000000..4655ff9616
--- /dev/null
+++ b/src/main/webapp/lab/collect_samples.xhtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/divide_samples.xhtml b/src/main/webapp/lab/divide_samples.xhtml
new file mode 100644
index 0000000000..b1670b801c
--- /dev/null
+++ b/src/main/webapp/lab/divide_samples.xhtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/generate_barcodes_for_lab.xhtml b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml
new file mode 100644
index 0000000000..31729ee468
--- /dev/null
+++ b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/reject_samples.xhtml b/src/main/webapp/lab/reject_samples.xhtml
new file mode 100644
index 0000000000..45fe692674
--- /dev/null
+++ b/src/main/webapp/lab/reject_samples.xhtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/revert_samples.xhtml b/src/main/webapp/lab/revert_samples.xhtml
new file mode 100644
index 0000000000..b10a3445e6
--- /dev/null
+++ b/src/main/webapp/lab/revert_samples.xhtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/lab/sample_at_lab_index.xhtml b/src/main/webapp/lab/sample_at_lab_index.xhtml
new file mode 100644
index 0000000000..25647ac3d8
--- /dev/null
+++ b/src/main/webapp/lab/sample_at_lab_index.xhtml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -15,7 +15,8 @@
@@ -23,46 +24,44 @@
class="w-100"
ajax="false"
value="Collected Samples"
- action="#{patientInvestigationController.navigateToCollelcted()}" />
-
+ icon="fa fa-vials"
+ action="#{patientInvestigationController.navigateToCollelcted()}">
-
+ value="Sent to Lab"
+ icon="fa fa-flask"
+ action="#{patientInvestigationController.navigateToSentToLab()}">
-
-
+
+
-
-
-
-
-
-
-
-
-