From fee085a5c571aea28789ab7405241a3f118db8ee Mon Sep 17 00:00:00 2001 From: mahdahar <89adham@gmail.com> Date: Thu, 17 Apr 2025 12:58:07 +0700 Subject: [PATCH] creating admin page --- app/Config/Routes.php | 4 +- app/Controllers/API_Admin.php | 42 +++++--- app/Controllers/AdminPages.php | 7 +- app/Views/admin/HISMessages.php | 99 +++++++++++++++++++ .../{LISRequests.php => HISRequests.php} | 45 ++++----- app/Views/admin/layout.php | 19 ++-- 6 files changed, 164 insertions(+), 52 deletions(-) create mode 100644 app/Views/admin/HISMessages.php rename app/Views/admin/{LISRequests.php => HISRequests.php} (65%) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index bf5c5db..9f3adec 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -23,10 +23,8 @@ $routes->get('/api/results_preview/(:any)', 'API_TM::results_preview/$1'); // send oc // send new master -$routes->get('/admin', 'AdminPages::LISRequests'); -$routes->get('/admin/LISRequests', 'AdminPages::LISRequests'); +$routes->get('/admin', 'AdminPages::HISRequests'); $routes->get('/admin/HISRequests', 'AdminPages::HISRequests'); $routes->get('/admin/HISMessages', 'AdminPages::HISMessages'); -$routes->post('/admin/api/LISRequests', 'API_Admin::LISRequests_index'); $routes->post('/admin/api/HISRequests', 'API_Admin::HISRequests_index'); $routes->post('/admin/api/HISMessages', 'API_Admin::HISMessages_index'); diff --git a/app/Controllers/API_Admin.php b/app/Controllers/API_Admin.php index e27794c..f3b1081 100644 --- a/app/Controllers/API_Admin.php +++ b/app/Controllers/API_Admin.php @@ -9,30 +9,42 @@ class API_Admin extends ResourceController { } - public function LISRequests_index() { + public function HISRequests_index() { $db = \Config\Database::connect(); $date1 = $this->request->getPost('date1'); $date2 = $this->request->getPost('date2'); - $sql = "select r.SP_ACCESSNUMBER, r.HOSTORDERNUMBER, r.SP_HOSPNUMBER, r.SP_LOCCODE, p.PATNUMBER, p.FIRSTNAME, p.NAME from SP_REQUESTS r + $sql = "select r.SP_ACCESSNUMBER, r.HOSTORDERNUMBER, PATNUMBER=right(p.PATNUMBER,8), p.FIRSTNAME, p.NAME, tr.*, + STUFF( + ( select ', '+ SP_TESTCODE from SP_TESTS + where SP_ACCESSNUMBER=r.SP_ACCESSNUMBER and DEPTH=0 + FOR XML PATH('') + ), 1, 1, '' + ) AS TESTS + from cmod.dbo.CM_TM_REQUESTS tr + left join SP_REQUESTS r on r.HOSTORDERNUMBER=tr.REFFID left join PATIENTS p on p.PATID=r.PATID - where r.COLLECTIONDATE between '2025-03-17 00:00' and '2025-03-17 23:59'"; + where tr.REQDATE between '".$date1."T00:00' and '".$date2."T23:59' + order by tr.REQDATE"; $query = $db->query($sql); $results = $query->getResultArray(); - /* - $response = [ - 'status' => 200, - 'error' => null, - 'message' => 'Data received successfully!', - 'data' => [ - 'date1' => $date1, - 'date2' => $date2, - ], - ]; - */ + + return $this->respond([ + 'data' => $results + ]); + } + + public function HISMessages_index() { + $db = \Config\Database::connect(); + $date1 = $this->request->getPost('date1'); + $date2 = $this->request->getPost('date2'); + + $sql = "select LOGID, BODY, LOGDATE from cmod.dbo.CM_TM_LOGS where LOGDATE between '$date1 00:00' and '$date2 23:59'"; + $query = $db->query($sql); + $results = $query->getResultArray(); + return $this->respond([ 'data' => $results ]); } - } diff --git a/app/Controllers/AdminPages.php b/app/Controllers/AdminPages.php index 37ba545..73c646f 100644 --- a/app/Controllers/AdminPages.php +++ b/app/Controllers/AdminPages.php @@ -4,8 +4,11 @@ namespace App\Controllers; class AdminPages extends BaseController { - public function LISRequests() { - return view('admin/LISRequests'); + public function HISRequests() { + return view('admin/HISRequests'); } + public function HISMessages() { + return view('admin/HISMessages'); + } } diff --git a/app/Views/admin/HISMessages.php b/app/Views/admin/HISMessages.php new file mode 100644 index 0000000..3e7206d --- /dev/null +++ b/app/Views/admin/HISMessages.php @@ -0,0 +1,99 @@ +extend('admin/layout') ?> + +section('content') ?> +
+
+
+
Messages
+
+
+ +
+ +
+ +
+ +
+ - +
+ +
+ +
+ +
+ +
+
+ +
+ + + + + + + + +
# Messages Action
+
+
+
+
+endSection() ?> + +section('script') ?> + +endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/LISRequests.php b/app/Views/admin/HISRequests.php similarity index 65% rename from app/Views/admin/LISRequests.php rename to app/Views/admin/HISRequests.php index ed16659..ed5298c 100644 --- a/app/Views/admin/LISRequests.php +++ b/app/Views/admin/HISRequests.php @@ -4,7 +4,7 @@
-
LIS Requests
+
Requests
@@ -28,13 +28,13 @@
- +
- + - +
Access# Pat# PatName LocID# Pat# PatName Loc Test
@@ -49,14 +49,10 @@ $('#date1').val(curDate); $('#date2').val(curDate); function searchRequests() { + const url = 'admin/api/HISRequests'; const form = document.getElementById('myForm'); const formData = new FormData(form); - const tableBody = document.getElementById('dataTable').getElementsByTagName('tbody')[0]; - tableBody.innerHTML = ''; - - let url = 'admin/api/LISRequests'; - fetch(url, { method: 'POST', body: formData @@ -64,23 +60,24 @@ function searchRequests() { if (!response.ok) { throw new Error(`HTTP error! status: ${response.status}`); } return response.json(); }).then(data => { + $("#dataTable").DataTable().destroy(); + $("#tbody").html(""); data.data.forEach(item => { - const row = ` ${item.SP_ACCESSNUMBER}
HON : ${item.HOSTORDERNUMBER} ${item.name} ${item.price} `; - tableBody.insertAdjacentHTML('beforeend', row); - }) + const row = ` + Access# : ${item.SP_ACCESSNUMBER}
Reff# : ${item.REFFID} | Visit : ${item.REQNUMBER} + ${item.PATNUMBER} + ${item.FIRSTNAME} ${item.NAME} + ${item.LOC} + ${item.TESTS} + `; + $("#tbody").append(row); + }); + $('#dataTable').DataTable({ + "pageLength": 20, + "lengthMenu": [10, 20, 50, 100] + }); }); - /* - data.forEach(rowData => { - const row = tableBody.insertRow(); - for (const key in rowData) { - if (rowData.hasOwnProperty(key)) { - const cell = row.insertCell(); - cell.textContent = rowData[key]; - } - } - }); - }); - */ + } endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/layout.php b/app/Views/admin/layout.php index 48c051f..959f65c 100644 --- a/app/Views/admin/layout.php +++ b/app/Views/admin/layout.php @@ -4,14 +4,18 @@ CMOD-Rest Administrator - - - - - + + + + + @@ -19,9 +23,8 @@
CMOD-Rest Administrator