diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 63ef3d1..ed2cffc 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -74,6 +74,21 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->get('toggle/(:num)/(:hash)', 'LoggerController::toggle/$1/$2', ['filter' => 'authFilter:master,director']); $routes->post('batchjob', 'LoggerController::batchjob', ['filter' => 'authFilter:master']); }); + $routes->group('hpilo', static function ($routes) { + $routes->get('', 'HPILOController::index'); + $routes->get('excel', 'HPILOController::excel'); + $routes->get('insert', 'HPILOController::insert_form', ['filter' => 'authFilter:master,director']); + $routes->post('insert', 'HPILOController::insert', ['filter' => 'authFilter:master,director']); + $routes->get('update/(:num)', 'HPILOController::update_form/$1'); + $routes->post('update/(:num)', 'HPILOController::update/$1'); + $routes->get('view/(:num)', 'HPILOController::view/$1'); + $routes->get('delete/(:num)', 'HPILOController::delete/$1', ['filter' => 'authFilter:master']); + $routes->get('toggle/(:num)/(:hash)', 'HPILOController::toggle/$1/$2', ['filter' => 'authFilter:master,director']); + $routes->post('batchjob', 'HPILOController::batchjob', ['filter' => 'authFilter:master']); + $routes->post('console/(:num)', 'HPILOController::console/$1', ['filter' => 'authFilter:master']); + $routes->post('reset/(:num)/(:alpha)', 'HPILOController::reset/$1/$2', ['filter' => 'authFilter:master']); + $routes->post('reload/(:num)', 'HPILOController::reload/$1', ['filter' => 'authFilter:master']); + }); }); /* * -------------------------------------------------------------------- diff --git a/app/Controllers/Admin/HPILOController.php b/app/Controllers/Admin/HPILOController.php index 4126c47..0bc5081 100644 --- a/app/Controllers/Admin/HPILOController.php +++ b/app/Controllers/Admin/HPILOController.php @@ -157,7 +157,7 @@ class HPILOController extends \App\Controllers\Admin\AdminController // $entity = $this->refresh($ilo, $entity); $message = "{$entity->getTitle()} " . __FUNCTION__ . " 완료하였습니다."; Log::save("{$this->_viewDatas['title']} {$message}"); - return alert_CommonHelper($message, session()->get(LOGINS['RETURN_URL'])); + return alert_CommonHelper($message, $this->_session->get(SESSION_NAMES['RETURN_URL'])); } catch (\Exception $e) { $message = "{$entity->getTitle()} " . __FUNCTION__ . " 실패하였습니다."; Log::add("warning", $message . "
\n{$e->getMessage()}"); @@ -174,7 +174,7 @@ class HPILOController extends \App\Controllers\Admin\AdminController $entity = $this->refresh($ilo, $entity); $message = "{$entity->getTitle()} " . __FUNCTION__ . " 완료하였습니다."; Log::save("{$this->_viewDatas['title']} {$message}"); - return alert_CommonHelper($message, session()->get(LOGINS['RETURN_URL'])); + return alert_CommonHelper($message, $this->_session->get(SESSION_NAMES['RETURN_URL'])); } catch (\Exception $e) { $message = "{$entity->getTitle()} " . __FUNCTION__ . " 실패하였습니다."; Log::add("warning", $message . "
\n{$e->getMessage()}"); diff --git a/app/Models/HPILOModel.php b/app/Models/HPILOModel.php index 5e69d59..a312b10 100644 --- a/app/Models/HPILOModel.php +++ b/app/Models/HPILOModel.php @@ -31,10 +31,17 @@ class HPILOModel extends CommonModel { return $this->asObject(HPILOEntity::class)->where($field, $value)->first(); } - public function getEntity(int $uid): ?HPILOEntity + public function getEntity($uid): ?HPILOEntity { return $this->getEntityByField($this->primaryKey, $uid); } + public function getFieldFormOptions(array $wheres = array(), $temps = array()): array + { + foreach ($this->asObject(HPILOEntity::class)->where($wheres)->findAll() as $entity) { + $temps[$entity->getPrimaryKey()] = $entity->getTitle(); + } + return $temps; + } public function create(array $datas): HPILOEntity { return $this->create_process(new HPILOEntity($datas));