update laporan hasil validasi, reffid(otw), TimeZones untuk user admin,lisfse,system ke wita, Tampilan data untuk api dashboard menjadi 25

app/Controllers/API_Dashboard.php

@@ -11,9 +11,9 @@ class API_Dashboard extends ResourceController {
 		// Mengetahui Apakah User Login adalah Bali atau Surabaya
 		$cityid = session()->get('usercityid');
 		if ($cityid == 1) {
-			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'B%' ";
+			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'BV%' ";
 		} elseif ($cityid == 2) {
-			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'S%' ";
+			$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'SV%' ";
 		} else { $filter_query = " "; }
 
 		$db = \Config\Database::connect();

app/Controllers/API_HISOrders.php

@@ -60,6 +60,7 @@ class API_HISOrders extends ResourceController {
 		$treatdoc = $this->request->getPost('treatdoc');
 		$payername = $this->request->getPost('payername');
 		$tests = $this->request->getPost('tests');
+		// $reffid = $this->request->getPost('reffid');
 		
 		if($orderid == '0') { 
 			$sql = "INSERT INTO cmod.dbo.CM_HIS_ORDERS (PATID, LOC, VISITNUMBER, VISITDATE, TREATDOC, PAYERNAME) 

app/Controllers/PrintResult.php

@@ -42,35 +42,56 @@ class PrintResult extends BaseController {
 				$analyst = "Mrs. Gusti Ayu Riska Mastari";
 				$noreg = "Reg. No: 570/SIPDS/0001/I/DPMPTSP/2023";
 				$signature = "<img src='http://cmod.id/assets/img/ttd_dr_komang.png' alt=''>";
+				$enteredby = "<td><u>Entered By</u></td>";
+				$labtech = "<td>Lab Technician</td>";
+				$verifiedby = "<td align='right'><u>Verified By</u></td>";
+
 			} else {
-				$doctor = "Waiting for Validation";
+				$verifiedby = "<td align='right' class='red_font'><b><u>Waiting for Validation</u></b></td>";
-				$analyst = "Waiting for Validation";
+				$enteredby = "<td class='red_font'><b><u>Waiting for Validation</u></b></td>";
-				$noreg = "Waiting for Validation";
+				$labtech = "<td></td>";
-				$signature = "Waiting for Validation";
+				$doctor = "";
+				$analyst = "";
+				$noreg = "";
+				$signature = "";
 			}
 			
 		} elseif ($cityid == 2) {
 
-			$doctor = "dr. I.G.A.A Putri Sri Rejeki, Sp.PK";
-			$noreg = "SIP : 503.446/1091/B/IP.DS/436.7.15/2022";
-			$signature = "<img id='ttd_p' src='http://cmod.id/assets/img/ttd_dr_putri.jpg' alt=''>";
-
 			if ($uservalidator == "MG") {
+				$doctor = "dr. I.G.A.A Putri Sri Rejeki, Sp.PK";
+				$noreg = "SIP : 503.446/1091/B/IP.DS/436.7.15/2022";
+				$signature = "<img id='ttd_p' src='http://cmod.id/assets/img/ttd_dr_putri.jpg' alt=''>";
+				$enteredby = "<td><u>Entered By</u></td>";
+				$labtech = "<td>Lab Technician</td>";
 				$analyst = "Mrs. Mega Rahayu Ningsih";
+				$verifiedby = "<td align='right'><u>Verified By</u></td>";
 			} else if ($uservalidator == "ACP") {
+				$doctor = "dr. I.G.A.A Putri Sri Rejeki, Sp.PK";
+				$noreg = "SIP : 503.446/1091/B/IP.DS/436.7.15/2022";
+				$signature = "<img id='ttd_p' src='http://cmod.id/assets/img/ttd_dr_putri.jpg' alt=''>";
+				$enteredby = "<td><u>Entered By</u></td>";
+				$labtech = "<td>Lab Technician</td>";
 				$analyst = "Mrs. Afrita Catur Pratiwi";
+				$verifiedby = "<td align='right'><u>Verified By</u></td>";
 			} else {
-				$doctor = "Waiting for Validation";
+				$verifiedby = "<td align='right' class='red_font'><b><u>Waiting for Validation</u></b></td>";
-				$analyst = "Waiting for Validation";
+				$enteredby = "<td class='red_font'><b><u>Waiting for Validation</u></b></td>";
-				$noreg = "Waiting for Validation";
+				$labtech = "<td></td>";
-				$signature = "Waiting for Validation";
+				$doctor = "";
+				$analyst = "";
+				$noreg = "";
+				$signature = "";
 			}
 
 		} else { //Jika Login Adalah Sistem dan tidak punya city id
-			$signature = "<img src='http://cmod.id/assets/img/ttd_dr_komang.png' alt=''>";
+			$verifiedby = "<td align='right' class='red_font'><b><u>LISFSE/SYSTEM/ADMIN</u></b></td>";
-			$doctor = "ADMIN/LISFSE/SYSTEM";
+			$enteredby = "<td class='red_font'><b><u>LISFSE/SYSTEM/ADMIN</u></b></td>";
-			$noreg = "ADMIN/LISFSE/SYSTEM";
+			$labtech = "<td></td>";
-			$analyst = "ADMIN/LISFSE/SYSTEM";
+			$doctor = "";
+			$analyst = "";
+			$noreg = "";
+			$signature = "";
 		}
 
 		if ($data[0] != null) {
@@ -249,11 +270,11 @@ class PrintResult extends BaseController {
 					<td align='right'>".$signature."</td>
 				</tr>
 				<tr>
-					<td><u>Entered By</u></td>
+					".$enteredby
-					<td align='right'><u>Verified By</u></td>
+					.$verifiedby."
 				</tr>
 				<tr>
-					<td>Lab Technician</td>
+					".$labtech."
 					<td align='right'>".$doctor."</td>
 				</tr>
 				<tr>

app/Views/admin/dashboard.php

@@ -161,7 +161,10 @@ function index() {
 					"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';					
 				$("#table-body").append(datarow);
 			}
-			$('#myTable').DataTable();
+			$('#myTable').DataTable({
+				"pageLength": 25, // Ganti sesuai kebutuhan
+				"lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+    		});
 			
 			// datatable filter
 			const filterButton = document.querySelectorAll("[data-filtertype]");

app/Views/fo/dashboard.php

@@ -161,7 +161,10 @@ function index() {
 					"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';					
 				$("#table-body").append(datarow);
 			}
-			$('#myTable').DataTable();
+			$('#myTable').DataTable({
+				"pageLength": 25, // Ganti sesuai kebutuhan
+				"lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+    		});
 			
 			// datatable filter
 			const filterButton = document.querySelectorAll("[data-filtertype]");

app/Views/orders_edit.php

@@ -6,34 +6,27 @@ $usercityid = session()->get('usercityid');
 
 if ($usercityid == 1) {
 	date_default_timezone_set('Asia/Makassar');
+	$valuevisitnumber = "value='BV'";
+	$locationdropdown = "
+		<option value='DPS'>Denpasar</option>
+	";
 } else if ($usercityid == 2) {
 	date_default_timezone_set('Asia/Jakarta');
+	$valuevisitnumber = "value='SV'";
+	$locationdropdown = "
+		<option value='SBY'>Surabaya</option>
+	";
 } else {
 	date_default_timezone_set('Asia/Makassar');
+	$valuevisitnumber = "";
+	$locationdropdown = "	
+		<option value='DPS'>Denpasar</option>
+		<option value='SBY'>Surabaya</option>
+	";
 }
 $now = date('Y-m-d H:i');
 $visitdate = $now;
 
-$usercityid = session()->get('usercityid');
-if ($usercityid == 1) {
-	$placeholdervisitnumber = "placeholder='BV........'";
-	$locationdropdown = "
-		<option value='DPS'>Denpasar</option>
-		<option value='SBY'>Surabaya</option>
-	";
-} else if ($usercityid == 2){
-	$placeholdervisitnumber = "placeholder='SV........'";
-	$locationdropdown = "
-		<option value='SBY'>Surabaya</option>	
-		<option value='DPS'>Denpasar</option>
-	";
-} else {
-	$placeholdervisitnumber = "placeholder='UserLISFSE'";
-	$locationdropdown = "
-		<option value='SBY'>Surabaya</option>	
-		<option value='DPS'>Denpasar</option>
-	";
-}
 ?>
 <style>
 .table > tbody > tr > td {
@@ -83,17 +76,19 @@ if ($usercityid == 1) {
 					<table class='table table-sm table-borderless'>
 						<tr> 
 							<td>Visit#</td> 
-							<td><input type="text" <?=$placeholdervisitnumber;?> id="visitnumber" class="form-control form-control-sm" oninput="this.value = this.value.toUpperCase();"></td> 
+							<td><input type="text" <?=$valuevisitnumber;?> id="visitnumber" class="form-control form-control-sm" oninput="this.value = this.value.toUpperCase();"></td> 
 							<td>Visit Date</td> 
 							<td><input type="datetime" id="visitdate" class="form-control form-control-sm" value='<?=$visitdate;?>'></td>
 						</tr>
 						<tr>
 							<td>Location</td> 
-							<td colspan='3'>
+							<td>
 								<select id='loc' class='form-control'>
 									<?=$locationdropdown;?>
 								</select>
 							</td>
+							<td>Reff ID</td> 
+							<td><input type="text" id="reffid" disabled class="form-control form-control-sm" value=''></td>
 						</tr>
 						<tr> 
 							<td>Payer Name</td> 

app/Views/orders_index.php

@@ -77,7 +77,11 @@ function index() {
 					'</tr>';
 				$("#table-body").append(datarow);
 			}
-			$('#myTable').DataTable();
+			// $('#myTable').DataTable();
+			$('#myTable').DataTable({
+				"pageLength": 25, // Ganti sesuai kebutuhan
+				"lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+    		});
 		},
 		error: function(response) { console.log(response.responseJSON); }
 	});

app/Views/sampling/dashboard.php

@@ -161,7 +161,10 @@ function index() {
 					"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';					
 				$("#table-body").append(datarow);
 			}
-			$('#myTable').DataTable();
+			$('#myTable').DataTable({
+				"pageLength": 25, // Ganti sesuai kebutuhan
+				"lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+    		});
 			
 			// datatable filter
 			const filterButton = document.querySelectorAll("[data-filtertype]");

app/Views/user/dashboard.php

@@ -161,7 +161,10 @@ function index() {
 					"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';					
 				$("#table-body").append(datarow);
 			}
-			$('#myTable').DataTable();
+			$('#myTable').DataTable({
+				"pageLength": 25, // Ganti sesuai kebutuhan
+				"lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+    		});
 			
 			// datatable filter
 			const filterButton = document.querySelectorAll("[data-filtertype]");