From d87278c017efd286cc6abe0324cee19587b48f80 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Fri, 20 Dec 2024 09:18:45 +0800
Subject: [PATCH] update printlabel, barcode dan tampilan dashboard access

---
 app/Controllers/PrintLabel.php              |  1 +
 app/Views/admin/dashboard_viewAccess.php    | 15 ++++++++++-----
 app/Views/fo/dashboard_viewAccess.php       | 15 ++++++++++-----
 app/Views/sampling/dashboard_viewAccess.php | 15 ++++++++++-----
 app/Views/user/dashboard_viewAccess.php     | 15 ++++++++++-----
 5 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/app/Controllers/PrintLabel.php b/app/Controllers/PrintLabel.php
index 3d4319e..6da7abd 100644
--- a/app/Controllers/PrintLabel.php
+++ b/app/Controllers/PrintLabel.php
@@ -322,5 +322,6 @@ P1
 			$sample = $data['SAMPLETYPE'];
 			$this->printSingle($access, $sample);
 		}
+		$this->labelPostekCollection($access);	
 	}
 }
\ No newline at end of file
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index 10a40ee..4b09413 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -56,10 +56,6 @@ $name = $row['NAME'];
 					<div class="card-title"><h3>Sample List</h3></div>
 					<table class='table'>
 						<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th>  </tr>
-						<tr> 
-							<td></td> <td></td> <td>Collection</td> 
-							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
-						</tr>
 						<tr> 
 							<td></td> <td></td> <td>All</td> 
 							<td>
@@ -69,11 +65,20 @@ $name = $row['NAME'];
 								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
 							</td>
 						</tr>
+						<tr> 
+							<td></td> <td></td> <td>Collection</td> 
+							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
+						</tr>
 						
 					<?php
 					foreach($data as $row) {
 						$sampletype = $row['SAMPLETYPE'];
 						$sampletext = $row['SHORTTEXT'];
+						if ($sampletype == "200") {
+							$sampletext = "Serum Kimia";
+						} else if ($sampletype == '250') {
+							$sampletext = "Serum Imun";
+						}
 						$tubestatus = $row['TUBESTATUS'];
 						$collstatus = $row['COLLSTATUS'];
 						$comment = $row['TUBECOMMENT'];
@@ -88,7 +93,7 @@ $name = $row['NAME'];
 						} else { 
 							echo "<td class='text-center'><input type='checkbox' class='form-check-input' id='recv$sampletype' disabled></td>"; 
 						}
-						echo "<td>$sampletext</td>"; 
+						echo "<td>$sampletext ($sampletype)</td>"; 
 						echo "<td> 
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
diff --git a/app/Views/fo/dashboard_viewAccess.php b/app/Views/fo/dashboard_viewAccess.php
index 10a40ee..4b09413 100644
--- a/app/Views/fo/dashboard_viewAccess.php
+++ b/app/Views/fo/dashboard_viewAccess.php
@@ -56,10 +56,6 @@ $name = $row['NAME'];
 					<div class="card-title"><h3>Sample List</h3></div>
 					<table class='table'>
 						<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th>  </tr>
-						<tr> 
-							<td></td> <td></td> <td>Collection</td> 
-							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
-						</tr>
 						<tr> 
 							<td></td> <td></td> <td>All</td> 
 							<td>
@@ -69,11 +65,20 @@ $name = $row['NAME'];
 								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
 							</td>
 						</tr>
+						<tr> 
+							<td></td> <td></td> <td>Collection</td> 
+							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
+						</tr>
 						
 					<?php
 					foreach($data as $row) {
 						$sampletype = $row['SAMPLETYPE'];
 						$sampletext = $row['SHORTTEXT'];
+						if ($sampletype == "200") {
+							$sampletext = "Serum Kimia";
+						} else if ($sampletype == '250') {
+							$sampletext = "Serum Imun";
+						}
 						$tubestatus = $row['TUBESTATUS'];
 						$collstatus = $row['COLLSTATUS'];
 						$comment = $row['TUBECOMMENT'];
@@ -88,7 +93,7 @@ $name = $row['NAME'];
 						} else { 
 							echo "<td class='text-center'><input type='checkbox' class='form-check-input' id='recv$sampletype' disabled></td>"; 
 						}
-						echo "<td>$sampletext</td>"; 
+						echo "<td>$sampletext ($sampletype)</td>"; 
 						echo "<td> 
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php
index 10a40ee..4b09413 100644
--- a/app/Views/sampling/dashboard_viewAccess.php
+++ b/app/Views/sampling/dashboard_viewAccess.php
@@ -56,10 +56,6 @@ $name = $row['NAME'];
 					<div class="card-title"><h3>Sample List</h3></div>
 					<table class='table'>
 						<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th>  </tr>
-						<tr> 
-							<td></td> <td></td> <td>Collection</td> 
-							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
-						</tr>
 						<tr> 
 							<td></td> <td></td> <td>All</td> 
 							<td>
@@ -69,11 +65,20 @@ $name = $row['NAME'];
 								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
 							</td>
 						</tr>
+						<tr> 
+							<td></td> <td></td> <td>Collection</td> 
+							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
+						</tr>
 						
 					<?php
 					foreach($data as $row) {
 						$sampletype = $row['SAMPLETYPE'];
 						$sampletext = $row['SHORTTEXT'];
+						if ($sampletype == "200") {
+							$sampletext = "Serum Kimia";
+						} else if ($sampletype == '250') {
+							$sampletext = "Serum Imun";
+						}
 						$tubestatus = $row['TUBESTATUS'];
 						$collstatus = $row['COLLSTATUS'];
 						$comment = $row['TUBECOMMENT'];
@@ -88,7 +93,7 @@ $name = $row['NAME'];
 						} else { 
 							echo "<td class='text-center'><input type='checkbox' class='form-check-input' id='recv$sampletype' disabled></td>"; 
 						}
-						echo "<td>$sampletext</td>"; 
+						echo "<td>$sampletext ($sampletype)</td>"; 
 						echo "<td> 
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php
index 10a40ee..4b09413 100644
--- a/app/Views/user/dashboard_viewAccess.php
+++ b/app/Views/user/dashboard_viewAccess.php
@@ -56,10 +56,6 @@ $name = $row['NAME'];
 					<div class="card-title"><h3>Sample List</h3></div>
 					<table class='table'>
 						<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th>  </tr>
-						<tr> 
-							<td></td> <td></td> <td>Collection</td> 
-							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
-						</tr>
 						<tr> 
 							<td></td> <td></td> <td>All</td> 
 							<td>
@@ -69,11 +65,20 @@ $name = $row['NAME'];
 								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
 							</td>
 						</tr>
+						<tr> 
+							<td></td> <td></td> <td>Collection</td> 
+							<td><button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printCollectionLabel(<?=$accessnumber;?>)"><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
+						</tr>
 						
 					<?php
 					foreach($data as $row) {
 						$sampletype = $row['SAMPLETYPE'];
 						$sampletext = $row['SHORTTEXT'];
+						if ($sampletype == "200") {
+							$sampletext = "Serum Kimia";
+						} else if ($sampletype == '250') {
+							$sampletext = "Serum Imun";
+						}
 						$tubestatus = $row['TUBESTATUS'];
 						$collstatus = $row['COLLSTATUS'];
 						$comment = $row['TUBECOMMENT'];
@@ -88,7 +93,7 @@ $name = $row['NAME'];
 						} else { 
 							echo "<td class='text-center'><input type='checkbox' class='form-check-input' id='recv$sampletype' disabled></td>"; 
 						}
-						echo "<td>$sampletext</td>"; 
+						echo "<td>$sampletext ($sampletype)</td>"; 
 						echo "<td> 
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>