From 52168d545e82c773a23db38b08cc2e2e1c52285a Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Wed, 18 Dec 2024 09:29:45 +0800
Subject: [PATCH] Update penulisan Serum-imun dan Serum-kimia Label

---
 app/Controllers/PrintLabel.php           | 10 +++++++++-
 app/Views/admin/dashboard_viewAccess.php | 11 +++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/PrintLabel.php b/app/Controllers/PrintLabel.php
index 44ea7a1..f0627ba 100644
--- a/app/Controllers/PrintLabel.php
+++ b/app/Controllers/PrintLabel.php
@@ -91,7 +91,15 @@ P1
 		$sex = $item['SEX'] == 1 ? "M" : "F";
 		$title = $item['SEX'] == 1 ? "Mr" : "Mrs";
 		$name = $item['NAME'];
-		$sample = $item['FULLTEXT'];
+
+		if ($sampletype == '200'){
+			$sample = 'SERUM KIMIA';
+		} else if ($sampletype == '250'){
+			$sample = 'SERUM IMUN';
+		} else {
+			$sample = $item['FULLTEXT'];
+		}
+		
 		$barcode = $item['BARCODE'];
 		$age = $item['AGE'];
 		$collectiondate = $item['COLLECTIONDATE'];
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index 519d4a8..7913701 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -56,6 +56,10 @@ $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'><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>
@@ -65,12 +69,7 @@ $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'><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
-						</tr>
-						-->
+						
 					<?php
 					foreach($data as $row) {
 						$sampletype = $row['SAMPLETYPE'];