From 748e7a04bc0ed60d40192c88d698dbea86e290d1 Mon Sep 17 00:00:00 2001 From: mahdahar <89adham@gmail.com> Date: Thu, 21 Nov 2024 15:38:56 +0700 Subject: [PATCH] fix dashboard to API --- app/Config/Routes.php | 7 ++- app/Controllers/Dashboard.php | 12 ++--- app/Controllers/Pages.php | 4 ++ app/Views/dashboard.php | 71 +++++++++++++++--------------- app/Views/dashboard_viewAccess.php | 54 +++++++++++++---------- 5 files changed, 81 insertions(+), 67 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index afd5df4..3f31f0a 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -5,8 +5,6 @@ use CodeIgniter\Router\RouteCollection; /** * @var RouteCollection $routes */ -$routes->get('/', 'Dashboard::index'); -$routes->get('/dashboard/viewAccess/(:any)', 'Dashboard::viewAccess/$1'); // Tubes $routes->get('/tubes/collect/(:any)/(:any)', 'Tubes::collect/$1/$2'); @@ -18,10 +16,15 @@ $routes->get('/tubes/unreceiveAll/(:any)', 'Tubes::unreceiveAll/$1'); $routes->post('/tubes/comment/(:any)/(:any)', 'Tubes::comment/$1/$2'); // Pages +$routes->get('/', 'Pages::dashboard_index'); $routes->get('/userroles/', 'Pages::userroles_index'); $routes->get('/users/', 'Pages::users_index'); $routes->get('/changePass/', 'Pages::changePass'); +$routes->get('/dashboard/viewAccess/(:any)', 'Dashboard::viewAccess/$1'); +// Dashboard +$routes->get('/api/dashboard/index', 'Dashboard::index'); + // DICT_TESTS $routes->get('/dict_tests/', 'Dict_tests::index'); diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php index fd04b1c..8f308cb 100644 --- a/app/Controllers/Dashboard.php +++ b/app/Controllers/Dashboard.php @@ -1,10 +1,12 @@ query($sql); $results = $query->getResultArray(); - $data['data'] = $results; - return view('dashboard', $data); + $data['data'] = $results; + return $this->respond($data,200); } public function viewAccess($accessnumber): string { diff --git a/app/Controllers/Pages.php b/app/Controllers/Pages.php index f5c4273..7e788b0 100644 --- a/app/Controllers/Pages.php +++ b/app/Controllers/Pages.php @@ -4,6 +4,10 @@ namespace App\Controllers; class Pages extends BaseController { + public function dashboard_index() { + return view('dashboard'); + } + public function userroles_index(): string { return view('userroles_index'); } diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 806a3fc..3b0b7c6 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -1,9 +1,6 @@ extend('layouts/main.php') ?> section('content') ?> -
-
+
- +
@@ -105,28 +102,7 @@ - - - - - - - - - - - - +
OrderStatus
Pending
@@ -144,18 +120,41 @@ section('script') ?> endSection() ?> \ No newline at end of file diff --git a/app/Views/dashboard_viewAccess.php b/app/Views/dashboard_viewAccess.php index e1046d8..7543714 100644 --- a/app/Views/dashboard_viewAccess.php +++ b/app/Views/dashboard_viewAccess.php @@ -59,7 +59,7 @@ span.badge { cursor:pointer; } Un-Coll. Un-Rec. "; - echo "$comment "; + echo "$comment "; echo " "; } ?> @@ -88,8 +88,9 @@ function collect(sample, access) { const url = 'tubes/collect/'+access+'/'+sample; fetch(url) .then(data => { - console.log(data); - $("#coll"+sample).prop("checked", true); + //console.log(data); + //$("#coll"+sample).prop("checked", true); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); } @@ -98,8 +99,9 @@ function collectAll(access) { const url = 'tubes/collectAll/'+access; fetch(url) .then(data => { - console.log(data); - $('input[id^="coll"]').prop('checked', true); + //console.log(data); + //$('input[id^="coll"]').prop('checked', true); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); @@ -110,8 +112,9 @@ function uncollect(sample, access) { const url = 'tubes/uncollect/'+access+'/'+sample; fetch(url) .then(data => { - console.log(data); - $("#coll"+sample).prop("checked", false); + //console.log(data); + //$("#coll"+sample).prop("checked", false); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); @@ -121,8 +124,9 @@ function uncollectAll(access) { const url = 'tubes/uncollectAll/'+access; fetch(url) .then(data => { - console.log(data); - $('input[id^="coll"]').prop('checked', false); + //console.log(data); + //$('input[id^="coll"]').prop('checked', false); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); } @@ -132,8 +136,9 @@ function unreceive(sample, access) { const url = 'tubes/unreceive/'+access+'/'+sample; fetch(url) .then(data => { - console.log(data); - $("#recv"+sample).prop("checked", false); + //console.log(data); + //$("#recv"+sample).prop("checked", false); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); @@ -143,25 +148,26 @@ function unreceiveAll(access) { const url = 'tubes/unreceiveAll/'+access; fetch(url) .then(data => { - console.log(data); - $('input[id^="recv"]').prop('checked', false); + //console.log(data); + //$('input[id^="recv"]').prop('checked', false); + viewAccess(access); }) .catch(error => { console.error('Error:',error); }); } function comment(sample, access, sampletext, comments) { const url = 'tubes/comment/'+access+'/'+sample; - let comment = prompt('Comment for sample '+sampletext, comments); - if(comment) { - $('#comment'+sample).html(comment +"'); - fetch(url, { - method: "POST", - body: JSON.stringify({ comment : comment }), - headers: { "Content-type": "application/json; charset=UTF-8" } - }) - .then(data => console.log(data)) - .catch(error => { console.error('Error:',error); }); - } + let comment = prompt('Comment for sample '+sampletext, comments); + //$('#comment'+sample).html(comment +"'); + fetch(url, { + method: "POST", + body: JSON.stringify({ comment : comment }), + headers: { "Content-type": "application/json; charset=UTF-8" } + }).then(data => { + //console.log(data); + viewAccess(access); + }) + .catch(error => { console.error('Error:',error); }); }