diff --git a/app/Config/Routes.php b/app/Config/Routes.php index f504331..a7778b8 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -19,8 +19,6 @@ $routes->get('/logout', 'Auth::logout'); $routes->get('label/coll/(:any)', 'Label::coll/$1'); $routes->get('label/dispatch/(:any)/(:any)', 'Label::dispatch/$1/$2'); $routes->get('label/all/(:any)', 'Label::print_all/$1'); -$routes->get('result/(:any)', 'Result::show/$1'); -$routes->post('result/validate', 'Result::res_validate'); // ------------------------------------------------------Page Based on Role------------------------------------------------------ // $routes->group('admin', ['filter' => 'role:1'], function($routes) { @@ -29,8 +27,7 @@ $routes->group('admin', ['filter' => 'role:1'], function($routes) { $routes->get('user', 'User::index'); $routes->post('user/create', 'User::create'); $routes->post('user/update', 'User::update'); - $routes->post('user/delete', 'User::delete'); - $routes->get('result/invalidate/(:any)', 'Result::invalidate/$1'); + $routes->post('user/delete', 'User::delete'); }); $routes->group('doctor', ['filter' => 'role:2'], function($routes) { @@ -45,10 +42,15 @@ $routes->group('cs', ['filter' => 'role:4'], function($routes) { $routes->get('/', 'CustomerService::index'); }); +// dummy long page +$routes->get('/dummypage', 'Home::dummyPage'); + // ------------------------------------------------------For API------------------------------------------------------ // // $routes->get('/api/dashboard', 'ApiDashboard::index'); -$routes->get('api/result/(:any)', 'Result::show/$1'); +$routes->get('api/request/validate/(:any)', 'Request::show/$1'); +$routes->post('api/request/validate/(:any)', 'Request::val/$1'); +$routes->delete('api/request/validate/(:any)', 'Request::unval/$1'); $routes->get('api/specimen/(:any)', 'Specimen::show/$1'); $routes->post('api/specimen/collect/(:any)', 'Specimen::collect/$1'); -$routes->post('api/specimen/unreceive/(:any)', 'Specimen::unreceive/$1'); \ No newline at end of file +$routes->delete('api/specimen/receive/(:any)', 'Specimen::unreceive/$1'); \ No newline at end of file diff --git a/app/Controllers/Admin.php b/app/Controllers/Admin.php index 819c363..f0e8a48 100644 --- a/app/Controllers/Admin.php +++ b/app/Controllers/Admin.php @@ -112,8 +112,5 @@ class Admin extends BaseController public function modal_specimen() { return view('admin/modal_specimen'); } - - public function result_show() { - return view('result/result_show'); - } + } diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 90f4ac7..c99740a 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -2,12 +2,10 @@ namespace App\Controllers; -class Home extends BaseController -{ +class Home extends BaseController { // Khusus Untuk Menangani URL http://glenlis - public function index() - { + public function index() { $session = session(); // Jika belum login, arahkan ke /login @@ -24,4 +22,8 @@ class Home extends BaseController default: return redirect()->to('/login'); } } + + public function dummyPage() { + return view('dummy_page'); + } } diff --git a/app/Controllers/Request.php b/app/Controllers/Request.php new file mode 100644 index 0000000..ac3a38c --- /dev/null +++ b/app/Controllers/Request.php @@ -0,0 +1,76 @@ +query($sql) + ->getResultArray(); + $data['val1'] = $result[0]['ISVAL1']; + $data['val1user'] = $result[0]['VAL1USER']; + $data['val2'] = $result[0]['ISVAL2']; + $data['val2user'] = $result[0]['VAL2USER']; + return view('admin/modal_request',$data); + } + + public function unval($accessnumber) { + $input = $this->request->getJSON(true); + $userid = $input['userid']; + $db = db_connect(); + + $sql = "update GDC_CMOD.dbo.CM_REQUESTS set ISVAL1=0, VAL1USER=null, VAL1DATE=null, + ISVAL2=0, VAL2USER=null, VAL2DATE=null where ACCESSNUMBER='$accessnumber'"; + $result = $db->query($sql); + $data = ['status' => 'success', 'message' => 'Data updated successfully', 'data' => "$accessnumber" ]; + + return $this->response->setJSON($data); + } + + public function val($accessnumber) { + $input = $this->request->getJSON(true); + $userid = $input['userid']; + $db = db_connect(); + //cek val + $sql = "select * from GDC_CMOD.dbo.CM_REQUESTS where ACCESSNUMBER='$accessnumber'"; + $result = $db->query($sql)->getResultArray(); + $data['sql1'] = $sql; + //$data['data'] = $result; + if(!isset($result[0])) { + $sql = "insert into GDC_CMOD.dbo.CM_REQUESTS(ACCESSNUMBER, ISVAL1, VAL1USER, VAL1DATE) VALUES ('$accessnumber', 1, '$userid', GETDATE())"; + $db->query($sql); + } else { + $row = $result[0]; + $isval1 = $row['ISVAL1']; + $isval2 = $row['ISVAL2']; + $val1user = $row['VAL1USER']; + if( $isval1 == 1 ) { + // val done + if ( $isval2 == 1 ) { return $this->response->setJSON(['message'=> 'validation done, not updating anything']); } + else { + // val2 if user val1 != userid + if($val1user != $userid) { + $sql = "update GDC_CMOD.dbo.CM_REQUESTS set ISVAL2=1, VAL2USER='$userid', VAL2DATE=GETDATE() where ACCESSNUMBER='$accessnumber'"; + } else { + $this->response->setStatusCode(500); + return $this->response->setJSON([ 'message'=> 'user already validate this request' ]); + } + } + } else { + // val1 + $sql = "update GDC_CMOD.dbo.CM_REQUESTS set ISVAL1=1, VAL1USER='$userid', VAL1DATE=GETDATE() where ACCESSNUMBER='$accessnumber'"; + } + $db->query($sql); + $data['message'] = "Validation updated"; + } + + return $this->response->setJSON($data); + } +} diff --git a/app/Controllers/Result.php b/app/Controllers/Result.php deleted file mode 100644 index 49084af..0000000 --- a/app/Controllers/Result.php +++ /dev/null @@ -1,44 +0,0 @@ -query($sql) - ->getResultArray(); - $data['status'] = $result[0]['STATS']; - $data['verif'] = $result[0]['ISVAL2']; - //return view('result/result_show',$data); - return view('admin/modal_result',$data); - } - - public function invalidate($accessnumber) { - $db = db_connect(); - $sql = "update GDC_CMOD.dbo.CM_REQUESTS set ISVAL=null, VALUSER=null, VALDATE=null, - ISVAL2=null, VAL2USER=null, VAL2DATE=null where ACCESSNUMBER='$accessnumber'"; - $result = $db->query($sql); - $data = ['status' => 'success', 'message' => 'Data updated successfully', 'data' => "$accessnumber" ]; - - return $this->response->setJSON($data); - } - - public function res_validate() { - $input = $this->request->getJSON(true); - $accessnumber = $input['accessnumber']; - $userid = $input['userid']; - $db = db_connect(); - $sql = "update GDC_CMOD.dbo.CM_REQUESTS set ISVAL2=1, VAL2USER='$userid', VAL2DATE=GETDATE() where ACCESSNUMBER='$accessnumber'"; - $result = $db->query($sql); - $data = ['status' => 'success', 'message' => 'Data updated successfully', 'data' => "$accessnumber" ]; - - return $this->response->setJSON($data); - } -} diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index 606f4cf..0c4d31b 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -126,8 +126,8 @@ - - + + @@ -138,12 +138,9 @@ Eng | Pdf
- - Invalidate
- --> - + @@ -167,10 +164,6 @@