From f5514db2d5f6652fc5a78b707ec6ad11d6bc76b9 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Thu, 26 Dec 2024 10:44:41 +0700
Subject: [PATCH] Update Dashboard Access(Memunculkan Informasi Pasien dan
 Pemerikasaan) dan Perbaikan Patnumber null pada tampilan Dashboard

---
 app/Controllers/AdminController.php         | 23 ++++++++++---------
 app/Controllers/FoController.php            | 25 ++++++++++++---------
 app/Controllers/SamplingController.php      | 25 ++++++++++++---------
 app/Controllers/UserController.php          | 25 ++++++++++++---------
 app/Views/admin/dashboard.php               | 10 +++++++--
 app/Views/admin/dashboard_viewAccess.php    | 12 +++++-----
 app/Views/fo/dashboard.php                  | 10 +++++++--
 app/Views/fo/dashboard_viewAccess.php       | 12 +++++-----
 app/Views/sampling/dashboard.php            | 10 +++++++--
 app/Views/sampling/dashboard_viewAccess.php | 12 +++++-----
 app/Views/user/dashboard.php                | 10 +++++++--
 app/Views/user/dashboard_viewAccess.php     | 12 +++++-----
 12 files changed, 111 insertions(+), 75 deletions(-)

diff --git a/app/Controllers/AdminController.php b/app/Controllers/AdminController.php
index a8f2c16..d76f44a 100644
--- a/app/Controllers/AdminController.php
+++ b/app/Controllers/AdminController.php
@@ -10,30 +10,33 @@ class AdminController extends BaseController {
 	
 	public function viewAccess($accessnumber): string {
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
+		$sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
 			left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
-			left join PATIENTS p on p.PATID=sr.PATID
 			left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE
 			left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER
 			where tu.SP_ACCESSNUMBER='$accessnumber'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		$hostordernumber = $results[0]['HOSTORDERNUMBER'];
+		$visit_number = $results[0]['HOSTORDERNUMBER'];
 		$data['data'] = $results;
 	
-		$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], 
-		[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'";
+		$sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
+			from cmod.dbo.CM_HIS_ORDERS ho
+			left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
+			WHERE ho.VISITNUMBER='$visit_number'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 
 		if($results != null) {
-			$data['patient_fullname'] = $results[0]['Patient Full Name'];
-			$data['visit_description'] = $results[0]['Visit Description'];
-			$data['treating_doctor'] = $results[0]['Treating Doctor'];
-			$data['payer_name'] = $results[0]['Payer Name'];
+			$data['patnumber'] = $results[0]['PATNUMBER'];
+			$data['patient_fullname'] = $results[0]['PATNAME'];
+			// $data['visit_description'] = $results[0]['Visit Description'];
+			$data['treating_doctor'] = $results[0]['TREATDOC'];
+			$data['payer_name'] = $results[0]['PAYERNAME'];
 		} else {
+			$data['patnumber'] = "";
 			$data['patient_fullname'] = "";
-			$data['visit_description'] = "";
+			// $data['visit_description'] = "";
 			$data['treating_doctor'] = "";
 			$data['payer_name'] = "";
 		}
diff --git a/app/Controllers/FoController.php b/app/Controllers/FoController.php
index fd04d92..ad6e6cf 100644
--- a/app/Controllers/FoController.php
+++ b/app/Controllers/FoController.php
@@ -10,37 +10,40 @@ class FoController extends BaseController {
 	
 	public function viewAccess($accessnumber): string {
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
+		$sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
 			left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
-			left join PATIENTS p on p.PATID=sr.PATID
 			left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE
 			left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER
 			where tu.SP_ACCESSNUMBER='$accessnumber'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		$hostordernumber = $results[0]['HOSTORDERNUMBER'];
+		$visit_number = $results[0]['HOSTORDERNUMBER'];
 		$data['data'] = $results;
 	
-		$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], 
-		[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'";
+		$sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
+			from cmod.dbo.CM_HIS_ORDERS ho
+			left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
+			WHERE ho.VISITNUMBER='$visit_number'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 
 		if($results != null) {
-			$data['patient_fullname'] = $results[0]['Patient Full Name'];
-			$data['visit_description'] = $results[0]['Visit Description'];
-			$data['treating_doctor'] = $results[0]['Treating Doctor'];
-			$data['payer_name'] = $results[0]['Payer Name'];
+			$data['patnumber'] = $results[0]['PATNUMBER'];
+			$data['patient_fullname'] = $results[0]['PATNAME'];
+			// $data['visit_description'] = $results[0]['Visit Description'];
+			$data['treating_doctor'] = $results[0]['TREATDOC'];
+			$data['payer_name'] = $results[0]['PAYERNAME'];
 		} else {
+			$data['patnumber'] = "";
 			$data['patient_fullname'] = "";
-			$data['visit_description'] = "";
+			// $data['visit_description'] = "";
 			$data['treating_doctor'] = "";
 			$data['payer_name'] = "";
 		}
 
 		$data['accessnumber'] = $accessnumber;
 
-        return view('fo/dashboard_viewAccess', $data);
+        return view('admin/dashboard_viewAccess', $data);
     }
 	
 	public function changePass() {
diff --git a/app/Controllers/SamplingController.php b/app/Controllers/SamplingController.php
index 022e444..d236168 100644
--- a/app/Controllers/SamplingController.php
+++ b/app/Controllers/SamplingController.php
@@ -10,37 +10,40 @@ class SamplingController extends BaseController {
 	
 	public function viewAccess($accessnumber): string {
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
+		$sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
 			left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
-			left join PATIENTS p on p.PATID=sr.PATID
 			left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE
 			left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER
 			where tu.SP_ACCESSNUMBER='$accessnumber'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		$hostordernumber = $results[0]['HOSTORDERNUMBER'];
+		$visit_number = $results[0]['HOSTORDERNUMBER'];
 		$data['data'] = $results;
 	
-		$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], 
-		[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'";
+		$sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
+			from cmod.dbo.CM_HIS_ORDERS ho
+			left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
+			WHERE ho.VISITNUMBER='$visit_number'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 
 		if($results != null) {
-			$data['patient_fullname'] = $results[0]['Patient Full Name'];
-			$data['visit_description'] = $results[0]['Visit Description'];
-			$data['treating_doctor'] = $results[0]['Treating Doctor'];
-			$data['payer_name'] = $results[0]['Payer Name'];
+			$data['patnumber'] = $results[0]['PATNUMBER'];
+			$data['patient_fullname'] = $results[0]['PATNAME'];
+			// $data['visit_description'] = $results[0]['Visit Description'];
+			$data['treating_doctor'] = $results[0]['TREATDOC'];
+			$data['payer_name'] = $results[0]['PAYERNAME'];
 		} else {
+			$data['patnumber'] = "";
 			$data['patient_fullname'] = "";
-			$data['visit_description'] = "";
+			// $data['visit_description'] = "";
 			$data['treating_doctor'] = "";
 			$data['payer_name'] = "";
 		}
 
 		$data['accessnumber'] = $accessnumber;
 
-        return view('sampling/dashboard_viewAccess', $data);
+        return view('admin/dashboard_viewAccess', $data);
     }
 	
 	public function changePass() {
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 5f92430..ace2107 100644
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -10,37 +10,40 @@ class UserController extends BaseController {
 	
 	public function viewAccess($accessnumber): string {
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
+		$sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
 			left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
-			left join PATIENTS p on p.PATID=sr.PATID
 			left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE
 			left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER
 			where tu.SP_ACCESSNUMBER='$accessnumber'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		$hostordernumber = $results[0]['HOSTORDERNUMBER'];
+		$visit_number = $results[0]['HOSTORDERNUMBER'];
 		$data['data'] = $results;
 	
-		$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], 
-		[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'";
+		$sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
+			from cmod.dbo.CM_HIS_ORDERS ho
+			left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
+			WHERE ho.VISITNUMBER='$visit_number'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 
 		if($results != null) {
-			$data['patient_fullname'] = $results[0]['Patient Full Name'];
-			$data['visit_description'] = $results[0]['Visit Description'];
-			$data['treating_doctor'] = $results[0]['Treating Doctor'];
-			$data['payer_name'] = $results[0]['Payer Name'];
+			$data['patnumber'] = $results[0]['PATNUMBER'];
+			$data['patient_fullname'] = $results[0]['PATNAME'];
+			// $data['visit_description'] = $results[0]['Visit Description'];
+			$data['treating_doctor'] = $results[0]['TREATDOC'];
+			$data['payer_name'] = $results[0]['PAYERNAME'];
 		} else {
+			$data['patnumber'] = "";
 			$data['patient_fullname'] = "";
-			$data['visit_description'] = "";
+			// $data['visit_description'] = "";
 			$data['treating_doctor'] = "";
 			$data['payer_name'] = "";
 		}
 
 		$data['accessnumber'] = $accessnumber;
 
-        return view('user/dashboard_viewAccess', $data);
+        return view('admin/dashboard_viewAccess', $data);
     }
 	
 	public function changePass() {
diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php
index f395da8..a529ac4 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -108,8 +108,14 @@ function index() {
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
 				colldate = data[i].COLLECTIONDATE.substr(0,10);
-				patnumber = data[i].PATNUMBER.substr(-16,16);
-				patnumber = patnumber.substring(patnumber.length - 10);
+
+				if (data[i].PATNUMBER != null) {
+					patnumber = data[i].PATNUMBER.substr(-16,16);
+					patnumber = patnumber.substring(patnumber.length - 10);
+				} else {
+					patnumber = ' NULL ';
+				}
+				
 				accessnumber = data[i].SP_ACCESSNUMBER;
 				patname = data[i].NAME;
 				hon = data[i].HOSTORDERNUMBER;
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index 4b09413..539ff41 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -1,10 +1,10 @@
 <?php
 if(isset($data[0])) {
-$row = $data[0];
-$patnumber = $row['PATNUMBER'];
-$patnumber = substr($patnumber, -10);
-$host = $row['HOSTORDERNUMBER'];
-$name = $row['NAME'];
+	$row = $data[0];
+
+	if (strlen($patnumber) < 10) {
+		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	}
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@@ -21,7 +21,7 @@ $name = $row['NAME'];
 
 					<th>Visit Description</th> 
 					<th>:</th> 
-					<td><?=$visit_description;?></td> 
+					<td></td> 
 					
 				</tr>
 				<tr> 
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index 5d1edea..39a5219 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -108,8 +108,14 @@ function index() {
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
 				colldate = data[i].COLLECTIONDATE.substr(0,10);
-				patnumber = data[i].PATNUMBER.substr(-16,16);
-				patnumber = patnumber.substring(patnumber.length - 10);
+
+				if (data[i].PATNUMBER != null) {
+					patnumber = data[i].PATNUMBER.substr(-16,16);
+					patnumber = patnumber.substring(patnumber.length - 10);
+				} else {
+					patnumber = ' NULL ';
+				}
+				
 				accessnumber = data[i].SP_ACCESSNUMBER;
 				patname = data[i].NAME;
 				hon = data[i].HOSTORDERNUMBER;
diff --git a/app/Views/fo/dashboard_viewAccess.php b/app/Views/fo/dashboard_viewAccess.php
index 4b09413..539ff41 100644
--- a/app/Views/fo/dashboard_viewAccess.php
+++ b/app/Views/fo/dashboard_viewAccess.php
@@ -1,10 +1,10 @@
 <?php
 if(isset($data[0])) {
-$row = $data[0];
-$patnumber = $row['PATNUMBER'];
-$patnumber = substr($patnumber, -10);
-$host = $row['HOSTORDERNUMBER'];
-$name = $row['NAME'];
+	$row = $data[0];
+
+	if (strlen($patnumber) < 10) {
+		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	}
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@@ -21,7 +21,7 @@ $name = $row['NAME'];
 
 					<th>Visit Description</th> 
 					<th>:</th> 
-					<td><?=$visit_description;?></td> 
+					<td></td> 
 					
 				</tr>
 				<tr> 
diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php
index 5891d08..9d82827 100644
--- a/app/Views/sampling/dashboard.php
+++ b/app/Views/sampling/dashboard.php
@@ -108,8 +108,14 @@ function index() {
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
 				colldate = data[i].COLLECTIONDATE.substr(0,10);
-				patnumber = data[i].PATNUMBER.substr(-16,16);
-				patnumber = patnumber.substring(patnumber.length - 10);
+
+				if (data[i].PATNUMBER != null) {
+					patnumber = data[i].PATNUMBER.substr(-16,16);
+					patnumber = patnumber.substring(patnumber.length - 10);
+				} else {
+					patnumber = ' NULL ';
+				}
+				
 				accessnumber = data[i].SP_ACCESSNUMBER;
 				patname = data[i].NAME;
 				hon = data[i].HOSTORDERNUMBER;
diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php
index 4b09413..539ff41 100644
--- a/app/Views/sampling/dashboard_viewAccess.php
+++ b/app/Views/sampling/dashboard_viewAccess.php
@@ -1,10 +1,10 @@
 <?php
 if(isset($data[0])) {
-$row = $data[0];
-$patnumber = $row['PATNUMBER'];
-$patnumber = substr($patnumber, -10);
-$host = $row['HOSTORDERNUMBER'];
-$name = $row['NAME'];
+	$row = $data[0];
+
+	if (strlen($patnumber) < 10) {
+		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	}
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@@ -21,7 +21,7 @@ $name = $row['NAME'];
 
 					<th>Visit Description</th> 
 					<th>:</th> 
-					<td><?=$visit_description;?></td> 
+					<td></td> 
 					
 				</tr>
 				<tr> 
diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php
index 7528c6f..75c41b0 100644
--- a/app/Views/user/dashboard.php
+++ b/app/Views/user/dashboard.php
@@ -108,8 +108,14 @@ function index() {
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
 				colldate = data[i].COLLECTIONDATE.substr(0,10);
-				patnumber = data[i].PATNUMBER.substr(-16,16);
-				patnumber = patnumber.substring(patnumber.length - 10);
+
+				if (data[i].PATNUMBER != null) {
+					patnumber = data[i].PATNUMBER.substr(-16,16);
+					patnumber = patnumber.substring(patnumber.length - 10);
+				} else {
+					patnumber = ' NULL ';
+				}
+				
 				accessnumber = data[i].SP_ACCESSNUMBER;
 				patname = data[i].NAME;
 				hon = data[i].HOSTORDERNUMBER;
diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php
index 4b09413..539ff41 100644
--- a/app/Views/user/dashboard_viewAccess.php
+++ b/app/Views/user/dashboard_viewAccess.php
@@ -1,10 +1,10 @@
 <?php
 if(isset($data[0])) {
-$row = $data[0];
-$patnumber = $row['PATNUMBER'];
-$patnumber = substr($patnumber, -10);
-$host = $row['HOSTORDERNUMBER'];
-$name = $row['NAME'];
+	$row = $data[0];
+
+	if (strlen($patnumber) < 10) {
+		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	}
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@@ -21,7 +21,7 @@ $name = $row['NAME'];
 
 					<th>Visit Description</th> 
 					<th>:</th> 
-					<td><?=$visit_description;?></td> 
+					<td></td> 
 					
 				</tr>
 				<tr>