From 059cda06cd5c47ae6e63f656b02de4c652c30b91 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Tue, 21 Jan 2025 11:05:09 +0700
Subject: [PATCH] Perbaikan Order Time dan Result Time

---
 app/Controllers/PrintResult.php  | 47 +++++++++++++++++++++++++++-----
 app/Views/admin/dashboard.php    |  2 +-
 app/Views/fo/dashboard.php       |  2 +-
 app/Views/orders_edit.php        |  8 ++++++
 app/Views/sampling/dashboard.php |  2 +-
 app/Views/user/dashboard.php     |  2 +-
 6 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index 6e2675a..941d9e1 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -40,7 +40,7 @@ class PrintResult extends BaseController {
 
 			$accessnumber = $data[0]['SP_ACCESSNUMBER'];
 			
-			$sex = $data[0]['sex'] == 1 ? "Male" : "Female";
+			$sex = $data[0]['SEX'] == 1 ? "Male" : "Female";
 			
 			$rm_number = $data[0]['PATNUMBER'];
 			$rm_number = substr($rm_number, -10);
@@ -53,13 +53,19 @@ class PrintResult extends BaseController {
 			if ($birth_date) { $birth_date = $birth_date->format('d-m-Y'); }
 
 			$hostordernumber = $data[0]['HOSTORDERNUMBER'];
+
 			$collection_date = $data[0]['COLLECTIONDATE'];
 			$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s.u', $collection_date);
 			if ($dateTime) {
 				$collection_date = $dateTime->format('d-m-Y H:i');
 			}
+
+			$result_date = $data[0]['RESULTDATE'];
+			$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s.u', $result_date);
+			if ($dateTime) {
+				$result_date = $dateTime->format('d-m-Y H:i');
+			}
 			
-			$resultdate = date('d-m-Y H:i', time());
 		} else {
 			$sex ='';
 			$accessnumber = "";
@@ -69,6 +75,7 @@ class PrintResult extends BaseController {
 			$birth_date = "";
 			$hostordernumber = "";
 			$collection_date = "";
+			$result_date = "";
 		}
 		
 		$fullPage="";
@@ -116,7 +123,7 @@ class PrintResult extends BaseController {
 						<td>$birth_date / $sex</td>
 						<th align='left'>Result Date/Time</th>
 						<td>:</td>
-						<td>$resultdate</td>
+						<td>$result_date</td>
 					</tr>
 	
 				</table>
@@ -379,10 +386,36 @@ class PrintResult extends BaseController {
         $db = \Config\Database::connect();
 
 		// Untuk Header
-		$sql = "select p.PATNUMBER, p.FIRSTNAME, p.NAME, p.BIRTHDATE, sr.HOSTORDERNUMBER, sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, p.sex
-			from PATIENTS p
-			left join SP_REQUESTS sr on p.PATID=sr.PATID
-			where sr.SP_ACCESSNUMBER='$access'";
+		$sql = "SELECT 
+					p.PATNUMBER, 
+					p.FIRSTNAME, 
+					p.NAME, 
+					p.BIRTHDATE, 
+					sr.HOSTORDERNUMBER, 
+					sr.COLLECTIONDATE, 
+					sr.SP_ACCESSNUMBER, 
+					p.SEX, 
+					r.MAX_RESDATE AS RESULTDATE
+				FROM 
+					PATIENTS p
+				LEFT JOIN 
+					SP_REQUESTS sr 
+					ON p.PATID = sr.PATID
+				LEFT JOIN 
+					(
+						SELECT 
+							MAX(RESDATE) AS MAX_RESDATE, 
+							ACCESSNUMBER 
+						FROM 
+							[cmod].[dbo].[CM_RESULTS]
+						WHERE 
+							ACCESSNUMBER = '$access'
+						GROUP BY 
+							ACCESSNUMBER
+					) r 
+					ON sr.SP_ACCESSNUMBER = r.ACCESSNUMBER
+				WHERE 
+					sr.SP_ACCESSNUMBER = '$access'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$header = $results[0];
diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php
index a529ac4..931b86a 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -107,7 +107,7 @@ function index() {
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
-				colldate = data[i].COLLECTIONDATE.substr(0,10);
+				colldate = data[i].COLLECTIONDATE.substr(0,16);
 
 				if (data[i].PATNUMBER != null) {
 					patnumber = data[i].PATNUMBER.substr(-16,16);
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index 39a5219..77a6171 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -107,7 +107,7 @@ function index() {
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
-				colldate = data[i].COLLECTIONDATE.substr(0,10);
+				colldate = data[i].COLLECTIONDATE.substr(0,16);
 
 				if (data[i].PATNUMBER != null) {
 					patnumber = data[i].PATNUMBER.substr(-16,16);
diff --git a/app/Views/orders_edit.php b/app/Views/orders_edit.php
index de99cb8..cc3da4d 100644
--- a/app/Views/orders_edit.php
+++ b/app/Views/orders_edit.php
@@ -2,8 +2,16 @@
 
 <?= $this->section('content') ?>
 <?php
+$usercityid = session()->get('usercityid');
+
+if ($usercityid == 1) {
+	date_default_timezone_set('Asia/Makassar');
+} else if ($usercityid == 2) {
+	date_default_timezone_set('Asia/Jakarta');
+}
 $now = date('Y-m-d H:i');
 $visitdate = $now;
+
 $usercityid = session()->get('usercityid');
 if ($usercityid == 1) {
 	$placeholdervisitnumber = "placeholder='BV........'";
diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php
index 9d82827..f585974 100644
--- a/app/Views/sampling/dashboard.php
+++ b/app/Views/sampling/dashboard.php
@@ -107,7 +107,7 @@ function index() {
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
-				colldate = data[i].COLLECTIONDATE.substr(0,10);
+				colldate = data[i].COLLECTIONDATE.substr(0,16);
 
 				if (data[i].PATNUMBER != null) {
 					patnumber = data[i].PATNUMBER.substr(-16,16);
diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php
index 75c41b0..6387b68 100644
--- a/app/Views/user/dashboard.php
+++ b/app/Views/user/dashboard.php
@@ -107,7 +107,7 @@ function index() {
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
-				colldate = data[i].COLLECTIONDATE.substr(0,10);
+				colldate = data[i].COLLECTIONDATE.substr(0,16);
 
 				if (data[i].PATNUMBER != null) {
 					patnumber = data[i].PATNUMBER.substr(-16,16);