From 401b737a577d29f0cea12bd25273baaa215f5982 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Mon, 13 Jan 2025 13:31:54 +0700
Subject: [PATCH] Update pembeda tampilan dashboard dan his orders untuk user
 bali dan sby. Update label untuk sample surabaya

---
 app/Controllers/API_Dashboard.php | 16 ++++++++++++++--
 app/Controllers/API_HISOrders.php | 13 ++++++++++++-
 app/Controllers/PrintLabelSby.php |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php
index cc56fa7..2b35dcf 100644
--- a/app/Controllers/API_Dashboard.php
+++ b/app/Controllers/API_Dashboard.php
@@ -7,6 +7,17 @@ class API_Dashboard extends ResourceController {
 	protected $format = 'json';
     
 	public function index() {
+
+		// Mengetahui Apakah User Login adalah Bali atau Surabaya
+		$cityid = session()->get('usercityid');
+		if ($cityid == 1) {
+			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'BV%' ";
+		} elseif ($cityid == 2) {
+			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'SV%' ";
+		} else {
+			$filter_query = " ";
+		}
+
 		$db = \Config\Database::connect();
 		$date1 = $this->request->getPost('date1');
 		$date2 = $this->request->getPost('date2');
@@ -51,8 +62,9 @@ end STATS
 	from SP_REQUESTS sr
 	left join PATIENTS p on p.PATID=sr.PATID
 	left join REQUESTS r on r.ACCESSNUMBER=sr.SP_ACCESSNUMBER
-	where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'
-	order by sr.COLLECTIONDATE desc";
+	where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'" 
+	.$filter_query.
+	"order by sr.COLLECTIONDATE desc";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$data['data'] = $results;
diff --git a/app/Controllers/API_HISOrders.php b/app/Controllers/API_HISOrders.php
index acb259f..c6241d8 100644
--- a/app/Controllers/API_HISOrders.php
+++ b/app/Controllers/API_HISOrders.php
@@ -7,6 +7,17 @@ class API_HISOrders extends ResourceController {
 	protected $format = 'json';
     
 	public function index() {
+
+		// Mengetahui Apakah User Login adalah Bali atau Surabaya
+		$cityid = session()->get('usercityid');
+		if ($cityid == 1) {
+			$filter_query = " AND o.VISITNUMBER LIKE 'BV%' ";
+		} elseif ($cityid == 2) {
+			$filter_query = " AND o.VISITNUMBER LIKE 'SV%' ";
+		} else {
+			$filter_query = " ";
+		}
+
 		$db = \Config\Database::connect();
 		$date1 = $this->request->getPost('date1');
 		$date2 = $this->request->getPost('date2');
@@ -18,7 +29,7 @@ class API_HISOrders extends ResourceController {
 			for xml path('')),1,1,'')
 			from cmod.dbo.CM_HIS_ORDERS o 
 			left join cmod.dbo.CM_HIS_PATIENTS p on p.PATID=o.PATID
-			where o.VISITDATE between '$date1 00:00' and '$date2 23:59'";
+			where o.VISITDATE between '$date1 00:00' and '$date2 23:59' " . $filter_query;
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$data['data'] = $results;
diff --git a/app/Controllers/PrintLabelSby.php b/app/Controllers/PrintLabelSby.php
index 8e698d1..470391a 100644
--- a/app/Controllers/PrintLabelSby.php
+++ b/app/Controllers/PrintLabelSby.php
@@ -141,7 +141,7 @@ class PrintLabelSby extends BaseController {
 ^FO325,42^ADN,18,10^FD$sex {$age}Y^FS
 ^FO4,54^ADN,18,10^FD$sample^FS
 ^FO265,64^ADN,18,10^FDChapter^FS
-^FO13,85^BY3,3,70^BCN,70,N,N^FD$barcode^FS
+^FO54,85^BY2,3,70^BCN,70,N,N^FD$barcode^FS
 ^FO115,160^ADN,18,10^FDSAM# $barcode^FS
 ^FO4,182^ADN,18,10^FDRM:$uhid^FS
 ^FO195,182^ADN,18,10^FD$collection_date^FS