diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php index 6002583..cef2e21 100644 --- a/app/Controllers/API_Dashboard.php +++ b/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(); diff --git a/app/Controllers/API_HISOrders.php b/app/Controllers/API_HISOrders.php index c6241d8..3b7b572 100644 --- a/app/Controllers/API_HISOrders.php +++ b/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) diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index 4f41f12..e4a4d28 100644 --- a/app/Controllers/PrintResult.php +++ b/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 = ""; + $enteredby = "Entered By"; + $labtech = "Lab Technician"; + $verifiedby = "Verified By"; + } else { - $doctor = "Waiting for Validation"; - $analyst = "Waiting for Validation"; - $noreg = "Waiting for Validation"; - $signature = "Waiting for Validation"; + $verifiedby = "Waiting for Validation"; + $enteredby = "Waiting for Validation"; + $labtech = ""; + $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 = ""; - 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 = ""; + $enteredby = "Entered By"; + $labtech = "Lab Technician"; $analyst = "Mrs. Mega Rahayu Ningsih"; + $verifiedby = "Verified By"; } 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 = ""; + $enteredby = "Entered By"; + $labtech = "Lab Technician"; $analyst = "Mrs. Afrita Catur Pratiwi"; + $verifiedby = "Verified By"; } else { - $doctor = "Waiting for Validation"; - $analyst = "Waiting for Validation"; - $noreg = "Waiting for Validation"; - $signature = "Waiting for Validation"; + $verifiedby = "Waiting for Validation"; + $enteredby = "Waiting for Validation"; + $labtech = ""; + $doctor = ""; + $analyst = ""; + $noreg = ""; + $signature = ""; } } else { //Jika Login Adalah Sistem dan tidak punya city id - $signature = ""; - $doctor = "ADMIN/LISFSE/SYSTEM"; - $noreg = "ADMIN/LISFSE/SYSTEM"; - $analyst = "ADMIN/LISFSE/SYSTEM"; + $verifiedby = "LISFSE/SYSTEM/ADMIN"; + $enteredby = "LISFSE/SYSTEM/ADMIN"; + $labtech = ""; + $doctor = ""; + $analyst = ""; + $noreg = ""; + $signature = ""; } if ($data[0] != null) { @@ -249,11 +270,11 @@ class PrintResult extends BaseController { ".$signature." - Entered By - Verified By + ".$enteredby + .$verifiedby." - Lab Technician + ".$labtech." ".$doctor." diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php index 87be006..fb5d099 100644 --- a/app/Views/admin/dashboard.php +++ b/app/Views/admin/dashboard.php @@ -161,7 +161,10 @@ function index() { "

" +''; $("#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]"); diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php index d44d0b4..5906d3e 100644 --- a/app/Views/fo/dashboard.php +++ b/app/Views/fo/dashboard.php @@ -161,7 +161,10 @@ function index() { "

" +''; $("#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]"); diff --git a/app/Views/orders_edit.php b/app/Views/orders_edit.php index fa7ed17..1db3226 100644 --- a/app/Views/orders_edit.php +++ b/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 = " + + "; } else if ($usercityid == 2) { date_default_timezone_set('Asia/Jakarta'); + $valuevisitnumber = "value='SV'"; + $locationdropdown = " + + "; } else { date_default_timezone_set('Asia/Makassar'); + $valuevisitnumber = ""; + $locationdropdown = " + + + "; } $now = date('Y-m-d H:i'); $visitdate = $now; -$usercityid = session()->get('usercityid'); -if ($usercityid == 1) { - $placeholdervisitnumber = "placeholder='BV........'"; - $locationdropdown = " - - - "; -} else if ($usercityid == 2){ - $placeholdervisitnumber = "placeholder='SV........'"; - $locationdropdown = " - - - "; -} else { - $placeholdervisitnumber = "placeholder='UserLISFSE'"; - $locationdropdown = " - - - "; -} ?>