diff --git a/.gitignore b/.gitignore index 243e59b..c296bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ !cmod.7z !.gitignore !env -!cmod.sql \ No newline at end of file +!cmod.sql +!pbmcDps_dict_tests.csv \ No newline at end of file diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 3f31f0a..164fc74 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -6,6 +6,13 @@ use CodeIgniter\Router\RouteCollection; * @var RouteCollection $routes */ +// 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('/dictTests/', 'Pages::dictTests_index'); + // Tubes $routes->get('/tubes/collect/(:any)/(:any)', 'Tubes::collect/$1/$2'); $routes->get('/tubes/collectAll/(:any)', 'Tubes::collectAll/$1'); @@ -15,12 +22,6 @@ $routes->get('/tubes/unreceive/(:any)/(:any)', 'Tubes::unreceive/$1/$2'); $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'); @@ -44,3 +45,6 @@ $routes->get('/api/users/index', 'Users::index'); $routes->get('/api/users/detail/(:any)', 'Users::detail/$1'); $routes->post('/api/users/savePass/(:any)', 'Users::savePass/$1'); $routes->post('/api/users/saveRole/(:any)', 'Users::saveRole/$1'); + +// API - DictTests +$routes->get('/api/dictTests/index', 'DictTests::index'); diff --git a/app/Controllers/DictTests.php b/app/Controllers/DictTests.php new file mode 100644 index 0000000..86faf69 --- /dev/null +++ b/app/Controllers/DictTests.php @@ -0,0 +1,49 @@ +query($sql); + $results = $query->getResultArray(); + $data['dictTests'] = $results; + + return $this->respond($data, 200); + } + + public function detail($userroleid) { + $db = \Config\Database::connect(); + $sql = "select * from cmod.dbo.CM_USERROLES where USERROLEID='$userroleid'"; + $query = $db->query($sql); + $results = $query->getResultArray(); + $data = $results[0]; + return $this->respond($data, 200); + } + + public function save($userroleid) { + $userrolecode = $this->request->getPost('userrolecode'); + $userrolename = $this->request->getPost('userrolename'); + + $db = \Config\Database::connect(); + if($userroleid == 0) { // new + $sql = "INSERT INTO cmod.dbo.CM_USERROLES(USERROLECODE, USERROLENAME, CREATEDATE) VALUES ('$userrolecode', '$userrolename', GETDATE())"; + } else { //update + $sql = "UPDATE cmod.dbo.CM_USERROLES set USERROLENAME='$userrolename', USERROLECODE='$userrolecode' where USERROLEID='$userroleid'"; + } + + if( $db->query($sql) ) { + return $this->respond(['message' => 'Save Success'],201); + } else { + $response = [ + 'errors' => $db->errors(), + 'message' => 'Invalid Inputs' + ]; + return $this->fail($response , 409); + } + } +} \ No newline at end of file diff --git a/app/Controllers/Pages.php b/app/Controllers/Pages.php index 7e788b0..927e778 100644 --- a/app/Controllers/Pages.php +++ b/app/Controllers/Pages.php @@ -39,4 +39,8 @@ class Pages extends BaseController { } return view('changePass'); } + + public function dictTests_index() { + return view('dictTests_index'); + } } diff --git a/app/Views/dashboard_viewAccess.php b/app/Views/dashboard_viewAccess.php index 052a8c9..53c0f1b 100644 --- a/app/Views/dashboard_viewAccess.php +++ b/app/Views/dashboard_viewAccess.php @@ -5,9 +5,9 @@ $patnumber = $row['PATNUMBER']; $host = $row['HOSTORDERNUMBER']; $name = $row['NAME']; ?> -