From 3668cfbcb83d7913d8ae1e8cee0bfd7467589b21 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Tue, 11 Nov 2025 18:31:37 +0900 Subject: [PATCH] trafficmonitor init...2 --- app/Controllers/Admin/AdminController.php | 30 ++-------- app/Controllers/Admin/CollectorController.php | 18 ++++-- app/Controllers/Admin/MylogController.php | 18 ++++-- app/Controllers/Admin/TrafficController.php | 16 ++++- app/Controllers/Admin/UserController.php | 16 ++++- app/Controllers/Auth/AuthController.php | 9 +++ app/Controllers/Auth/GoogleController.php | 8 +-- app/Controllers/Auth/LocalController.php | 8 +-- app/Controllers/CommonController.php | 16 +++-- app/Database/traffic_test1.sql | 5 +- app/Services/CommonService.php | 26 ++++---- app/Traits/UtilTrait.php | 27 ++++++--- app/Views/admin/collector/index.php | 59 ------------------- app/Views/admin/collector/modify_form.php | 22 ------- app/Views/admin/collector/view.php | 17 ------ .../admin/{collector => }/create_form.php | 2 +- app/Views/admin/{collector => }/download.php | 0 app/Views/admin/{mylog => }/index.php | 2 +- app/Views/admin/{traffic => }/modify_form.php | 2 +- app/Views/admin/mylog/create_form.php | 22 ------- app/Views/admin/mylog/download.php | 19 ------ app/Views/admin/mylog/modify_form.php | 22 ------- app/Views/admin/mylog/view.php | 17 ------ app/Views/admin/traffic/create_form.php | 22 ------- app/Views/admin/traffic/download.php | 19 ------ app/Views/admin/traffic/index.php | 59 ------------------- app/Views/admin/user/create_form.php | 22 ------- app/Views/admin/user/download.php | 19 ------ app/Views/admin/user/index.php | 59 ------------------- app/Views/admin/user/modify_form.php | 22 ------- app/Views/admin/user/view.php | 17 ------ app/Views/admin/{traffic => }/view.php | 2 +- 32 files changed, 120 insertions(+), 502 deletions(-) delete mode 100644 app/Views/admin/collector/index.php delete mode 100644 app/Views/admin/collector/modify_form.php delete mode 100644 app/Views/admin/collector/view.php rename app/Views/admin/{collector => }/create_form.php (98%) rename app/Views/admin/{collector => }/download.php (100%) rename app/Views/admin/{mylog => }/index.php (99%) rename app/Views/admin/{traffic => }/modify_form.php (98%) delete mode 100644 app/Views/admin/mylog/create_form.php delete mode 100644 app/Views/admin/mylog/download.php delete mode 100644 app/Views/admin/mylog/modify_form.php delete mode 100644 app/Views/admin/mylog/view.php delete mode 100644 app/Views/admin/traffic/create_form.php delete mode 100644 app/Views/admin/traffic/download.php delete mode 100644 app/Views/admin/traffic/index.php delete mode 100644 app/Views/admin/user/create_form.php delete mode 100644 app/Views/admin/user/download.php delete mode 100644 app/Views/admin/user/index.php delete mode 100644 app/Views/admin/user/modify_form.php delete mode 100644 app/Views/admin/user/view.php rename app/Views/admin/{traffic => }/view.php (97%) diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php index 0e1b926..3d5c214 100644 --- a/app/Controllers/Admin/AdminController.php +++ b/app/Controllers/Admin/AdminController.php @@ -103,26 +103,16 @@ abstract class AdminController extends CommonController return redirect()->back()->withInput()->with('message', $e->getMessage()); } } - protected function delete_process($uid): RedirectResponse - { - if (!$uid) { - throw new \Exception("계정 번호가 정의 되지 않았습니다."); - } - $entity = $this->service->getEntity($uid); - if (!$entity instanceof CommonEntity) { - throw new \Exception("{$uid}에 해당하는 계정을 찾을수 없습니다."); - } - $this->service->delete($uid); - $redirect_url = $this->getAuthContext()->popPreviousUrl() ?? implode(DIRECTORY_SEPARATOR, $this->getActionPaths()); - return redirect()->to($redirect_url)->with('message', "{$entity->getTitle()} 계정 생성이 완료되었습니다."); - } + abstract protected function delete_process($uid): array; final public function delete($uid): RedirectResponse { $action = __FUNCTION__; try { //초기화 $this->action_init_process($action); - return $this->delete_process($uid); + list($entity, $message) = $this->delete_process($uid); + $redirect_url = $this->getAuthContext()->popPreviousUrl() ?? implode(DIRECTORY_SEPARATOR, $this->getActionPaths()); + return redirect()->to($redirect_url)->with('message', $message); } catch (ValidationException $e) { // 검증 실패 시 폼으로 돌아가서 오류 메시지 표시 log_message('error', $e->getMessage()); @@ -132,17 +122,7 @@ abstract class AdminController extends CommonController return redirect()->back()->withInput()->with('message', $e->getMessage()); } } - protected function view_process($uid): CommonEntity - { - if (!$uid) { - throw new \Exception("계정 번호가 정의 되지 않았습니다."); - } - $entity = $this->service->getEntity($uid); - if (!$entity instanceof CommonEntity) { - throw new \Exception("{$uid}에 해당하는 계정을 찾을수 없습니다."); - } - return $entity; - } + abstract protected function view_process($uid): CommonEntity; final public function view($uid): string { $action = __FUNCTION__; diff --git a/app/Controllers/Admin/CollectorController.php b/app/Controllers/Admin/CollectorController.php index cc8d5ca..4935d22 100644 --- a/app/Controllers/Admin/CollectorController.php +++ b/app/Controllers/Admin/CollectorController.php @@ -35,11 +35,9 @@ class CollectorController extends AdminController break; case 'index': $fields = [...$fields, 'created_at']; - $this->addViewDatas('index_batchjobFields', $this->service->getFormService()->getBatchjobFields($filters)); - $this->addViewDatas('index_batchjobButtions', $this->service->getFormService()->getBatchjobButtons()); break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -81,8 +79,20 @@ class CollectorController extends AdminController $entity = $this->service->modify($uid, $dto); return array($entity, "{$entity->getTitle()} 수집정보 수정이 완료되었습니다."); } + protected function delete_process($uid): array + { + $entity = $this->service->delete($uid); + return array($entity, "{$entity->getTitle()} 수집정보 삭제 완료되었습니다."); + } protected function view_process($uid): CollectorEntity { - return parent::view_process($uid); + if (!$uid) { + throw new \Exception("수집정보 번호가 정의 되지 않았습니다."); + } + $entity = $this->service->getEntity($uid); + if (!$entity instanceof CollectorEntity) { + throw new \Exception("{$uid}에 해당하는 수집정보를 찾을수 없습니다."); + } + return $entity; } } diff --git a/app/Controllers/Admin/MylogController.php b/app/Controllers/Admin/MylogController.php index 0d71a0c..e3b47de 100644 --- a/app/Controllers/Admin/MylogController.php +++ b/app/Controllers/Admin/MylogController.php @@ -35,11 +35,9 @@ class MylogController extends AdminController break; case 'index': $fields = [...$fields, 'created_at']; - $this->addViewDatas('index_batchjobFields', $this->service->getFormService()->getBatchjobFields($filters)); - $this->addViewDatas('index_batchjobButtions', $this->service->getFormService()->getBatchjobButtons()); break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -81,8 +79,20 @@ class MylogController extends AdminController $entity = $this->service->modify($uid, $dto); return array($entity, "{$entity->getTitle()} 로그 수정이 완료되었습니다."); } + protected function delete_process($uid): array + { + $entity = $this->service->delete($uid); + return array($entity, "{$entity->getTitle()} 로그정보 삭제 완료되었습니다."); + } protected function view_process($uid): MylogEntity { - return parent::view_process($uid); + if (!$uid) { + throw new \Exception("로그정보 번호가 정의 되지 않았습니다."); + } + $entity = $this->service->getEntity($uid); + if (!$entity instanceof MylogEntity) { + throw new \Exception("{$uid}에 해당하는 로그정보를 찾을수 없습니다."); + } + return $entity; } } diff --git a/app/Controllers/Admin/TrafficController.php b/app/Controllers/Admin/TrafficController.php index 3ed215c..ccbe50c 100644 --- a/app/Controllers/Admin/TrafficController.php +++ b/app/Controllers/Admin/TrafficController.php @@ -36,7 +36,7 @@ class TrafficController extends AdminController $fields = [...$fields, 'created_at']; break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -78,8 +78,20 @@ class TrafficController extends AdminController $entity = $this->service->modify($uid, $dto); return array($entity, "{$entity->getTitle()} 트래픽정보 수정이 완료되었습니다."); } + protected function delete_process($uid): array + { + $entity = $this->service->delete($uid); + return array($entity, "{$entity->getTitle()} 트래픽정보 삭제 완료되었습니다."); + } protected function view_process($uid): TrafficEntity { - return parent::view_process($uid); + if (!$uid) { + throw new \Exception("트래픽정보 번호가 정의 되지 않았습니다."); + } + $entity = $this->service->getEntity($uid); + if (!$entity instanceof TrafficEntity) { + throw new \Exception("{$uid}에 해당하는 트래픽정보를 찾을수 없습니다."); + } + return $entity; } } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index e0e66a5..1657f17 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -37,7 +37,7 @@ class UserController extends AdminController $fields = ['id', 'name', 'email', 'mobile', 'role', 'status', 'created_at']; break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -78,8 +78,20 @@ class UserController extends AdminController $entity = $this->service->modify($uid, $dto); return array($entity, "{$entity->getTitle()} 계정 수정이 완료되었습니다."); } + protected function delete_process($uid): array + { + $entity = $this->service->delete($uid); + return array($entity, "{$entity->getTitle()} 계정 삭제 완료되었습니다."); + } protected function view_process($uid): UserEntity { - return parent::view_process($uid); + if (!$uid) { + throw new \Exception("계정 번호가 정의 되지 않았습니다."); + } + $entity = $this->service->getEntity($uid); + if (!$entity instanceof UserEntity) { + throw new \Exception("{$uid}에 해당하는 계정을 찾을수 없습니다."); + } + return $entity; } } diff --git a/app/Controllers/Auth/AuthController.php b/app/Controllers/Auth/AuthController.php index a91a537..59e4302 100644 --- a/app/Controllers/Auth/AuthController.php +++ b/app/Controllers/Auth/AuthController.php @@ -19,6 +19,15 @@ abstract class AuthController extends CommonController parent::initController($request, $response, $logger); $this->addActionPaths(self::PATH); } + protected function action_init_process(string $action): void + { + $this->addViewDatas('helper', $this->service->getHelper()); + $this->addViewDatas('formFields', $this->service->getFormService()->getFormFields()); + $this->addViewDatas('formRules', $this->service->getFormService()->getFormRules()); + $this->addViewDatas('formFilters', $this->service->getFormService()->getFormFilters()); + $this->addViewDatas('formOptions', $this->service->getFormService()->getFormOptions()); + parent::action_init_process($action); + } //로그인화면 final public function login_form(): string|RedirectResponse { diff --git a/app/Controllers/Auth/GoogleController.php b/app/Controllers/Auth/GoogleController.php index e37c038..dba75be 100644 --- a/app/Controllers/Auth/GoogleController.php +++ b/app/Controllers/Auth/GoogleController.php @@ -29,7 +29,7 @@ class GoogleController extends AuthController case 'login_form': break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -37,12 +37,6 @@ class GoogleController extends AuthController $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); $this->service->getFormService()->setBatchjobFilters($filters); - - $this->addViewDatas('helper', $this->service->getHelper()); - $this->addViewDatas('formFields', $this->service->getFormService()->getFormFields()); - $this->addViewDatas('formRules', $this->service->getFormService()->getFormRules()); - $this->addViewDatas('formFilters', $this->service->getFormService()->getFormFilters()); - $this->addViewDatas('formOptions', $this->service->getFormService()->getFormOptions()); } public function login_form_process(): void { diff --git a/app/Controllers/Auth/LocalController.php b/app/Controllers/Auth/LocalController.php index 54a0f48..d428a1a 100644 --- a/app/Controllers/Auth/LocalController.php +++ b/app/Controllers/Auth/LocalController.php @@ -34,7 +34,7 @@ class LocalController extends AuthController case 'login_form': break; default: - throw new \Exception("지원하지 않는 action입니다.({$action})"); + throw new \Exception("[{$action}] 지원하지 않는 action입니다."); // break; } $this->service->getFormService()->setFormFields($fields); @@ -42,12 +42,6 @@ class LocalController extends AuthController $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); $this->service->getFormService()->setBatchjobFilters($filters); - - $this->addViewDatas('helper', $this->service->getHelper()); - $this->addViewDatas('formFields', $this->service->getFormService()->getFormFields()); - $this->addViewDatas('formRules', $this->service->getFormService()->getFormRules()); - $this->addViewDatas('formFilters', $this->service->getFormService()->getFormFilters()); - $this->addViewDatas('formOptions', $this->service->getFormService()->getFormOptions()); } //로그인처리 protected function login_process(): UserEntity diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index a1e5e7d..a02a4a4 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -8,6 +8,7 @@ use App\Traits\LogTrait; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; +use PhpParser\Node\Scalar\MagicConst\Dir; use Psr\Log\LoggerInterface; abstract class CommonController extends BaseController @@ -92,16 +93,19 @@ abstract class CommonController extends BaseController // 'redirectUrl' => route_to('posts_list') // ]); // 중요한 작업 (결제 완료, 오류 등) → “로딩 페이지(View)”로 안내 후 JS redirect - $full_path = implode(DIRECTORY_SEPARATOR, [ - ...$view_paths, - $this->request->getVar('ActionTemplate') ?? $lastest_path, - $view_file - ]); + $full_path = implode(DIRECTORY_SEPARATOR, $view_paths); + $final_path = $this->request->getVar('ActionTemplate'); + if ($final_path) { + $full_path .= DIRECTORY_SEPARATOR . $final_path; + } + // else { + // $full_path .= DIRECTORY_SEPARATOR. $lastest_path; + // } $view_datas = [ ...$viewDatas, 'forms' => ['attributes' => ['method' => "post",], 'hiddens' => []], ]; helper(['form', __FUNCTION__]); - return view($full_path, ['viewDatas' => $view_datas]); + return view($full_path . DIRECTORY_SEPARATOR . $view_file, ['viewDatas' => $view_datas]); } } diff --git a/app/Database/traffic_test1.sql b/app/Database/traffic_test1.sql index 1e84df0..eb66ffa 100644 --- a/app/Database/traffic_test1.sql +++ b/app/Database/traffic_test1.sql @@ -91,7 +91,7 @@ CREATE TABLE `trafficinfo` ( `created_at` timestamp NOT NULL DEFAULT current_timestamp(), `deleted_at` timestamp NULL DEFAULT NULL, PRIMARY KEY (`uid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='트래픽정보'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='트래픽정보'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -100,6 +100,7 @@ CREATE TABLE `trafficinfo` ( LOCK TABLES `trafficinfo` WRITE; /*!40000 ALTER TABLE `trafficinfo` DISABLE KEYS */; +INSERT INTO `trafficinfo` VALUES (1,'테스트13','P3413','IDC-JP','221.117.125.18','313','available',NULL,'2025-11-11 07:21:37',NULL),(2,'테스트12','P3412','IDC-JP','221.117.125.15','213','available',NULL,'2025-11-11 06:11:43',NULL); /*!40000 ALTER TABLE `trafficinfo` ENABLE KEYS */; UNLOCK TABLES; @@ -147,4 +148,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-11-10 17:22:27 +-- Dump completed on 2025-11-11 16:45:17 diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index fc1f25b..e5f64cd 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -114,19 +114,21 @@ abstract class CommonService //CURD 결과처리용 //DB 결과 처리 로직 통합 및 개선 - protected function handle_save_result(mixed $result, ?CommonEntity $entity = null): CommonEntity + protected function handle_save_result(mixed $result, ?int $uid = null): CommonEntity { //최종 PK 값 결정 (insert/update 공통) - $pk = $this->model->useAutoIncrement() && is_numeric($result) && (int)$result > 0 - ? (int)$result - : ($entity->{$this->model->primaryKey} ?? null); // PK가 없는 경우 null 처리 + $pk = $this->model->useAutoIncrement() && is_numeric($result) && (int)$result > 0 ? (int)$result : $uid; if (empty($pk)) { // 모델의 insert/update가 실패했을 경우 에러 메시지를 포함하여 RuntimeException을 던집니다. $errors = $this->model->errors(); $errorMsg = is_array($errors) && !empty($errors) ? implode(", ", $errors) : "DB 작업 성공 후 PK를 확인할 수 없거나 모델 오류 발생."; throw new RuntimeException(__METHOD__ . "에서 오류발생: " . $errorMsg); } - return $this->getEntity($pk); + $entity = $this->getEntity($pk); + if (!$entity instanceof CommonEntity) { + throw new RuntimeException(__METHOD__ . "에서 오류발생: {$pk}에 해당하는 정보를 찾을수 없습니다."); + } + return $entity; } //생성용 @@ -161,15 +163,16 @@ abstract class CommonService if (!$entity instanceof CommonEntity) { throw new \Exception(__METHOD__ . "에서 오류발생: {$uid}에 해당하는 정보을 찾을수 없습니다."); } + //PrimaryKey 필드는 수정에서 제외 + unset($formDatas[$this->model->primaryKey]); $result = $this->model->update($uid, $formDatas); if ($result === false) { $errors = $this->model->errors(); $errorMsg = is_array($errors) ? implode(", ", $errors) : "업데이트 작업이 실패했습니다."; throw new RuntimeException(__METHOD__ . "에서 오류발생: " . $errorMsg); } - return $this->handle_save_result($result, $entity); + return $this->handle_save_result($result, $uid); } - public function modify($uid, object $dto): CommonEntity { $formDatas = (array)$dto; @@ -179,8 +182,7 @@ abstract class CommonService } return $this->modify_process($uid, $formDatas); } - - protected function delete_process($uid): bool + protected function delete_process($uid): CommonEntity { if (!$uid) { throw new \Exception("삭제에 필요한 PrimaryKey 가 정의 되지 않았습니다."); @@ -195,11 +197,9 @@ abstract class CommonService $errorMsg = is_array($errors) ? implode(", ", $errors) : "모델 삭제 작업이 실패했습니다."; throw new RuntimeException(__METHOD__ . "에서 오류발생: " . $errorMsg); } - - return $result; + return $entity; } - - final public function delete($uid): bool + final public function delete($uid): CommonEntity { return $this->delete_process($uid); } diff --git a/app/Traits/UtilTrait.php b/app/Traits/UtilTrait.php index 949d79a..f32a74c 100644 --- a/app/Traits/UtilTrait.php +++ b/app/Traits/UtilTrait.php @@ -81,22 +81,31 @@ trait UtilTrait return false; } - final public function alertTrait(string $msg, $url = null) + /** + * JavaScript Alert 및 페이지 이동 스크립트를 생성합니다. + * json_encode()를 사용하여 메시지 내 특수 문자를 안전하게 이스케이프 처리합니다. + * * @param string $msg 브라우저 Alert에 표시할 메시지 + * @param string|null $url Alert 후 이동할 URL (null: 이동 없음, 'close': 창 닫기) + * @return string HTML "; + return ""; } final public function getPasswordStringTrait($length = 8, $characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") diff --git a/app/Views/admin/collector/index.php b/app/Views/admin/collector/index.php deleted file mode 100644 index 80d0a62..0000000 --- a/app/Views/admin/collector/index.php +++ /dev/null @@ -1,59 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> - -section('content') ?> -
include("{$layouts['path']}/top"); ?>
- - - - - -
include("{$layouts['path']}/left_menu"); ?> -
include("{$template}/index_header"); ?>
-
- -
- include("{$template}/index_content_filter"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - $label): ?> - - - - - - - - - getStatus() === DEFAULTS['STATUS']; - $rowClass = $isDefaultStatus ? "" : 'class="table-danger"'; - $num = $viewDatas['index_totalcount'] - (($viewDatas['page'] - 1) * $viewDatas['perpage'] + $cnt); - ?> - > - - $label): ?> - - - - - -
번호getListLabel($field, $label, $viewDatas) ?>작업
getListButton('modify', $num, $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("{$template}/index_content_bottom"); ?> - -
-
-
include("{$template}/index_footer"); ?>
-
-
include("{$layouts['path']}/bottom"); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/collector/modify_form.php b/app/Views/admin/collector/modify_form.php deleted file mode 100644 index 040274f..0000000 --- a/app/Views/admin/collector/modify_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/collector/view.php b/app/Views/admin/collector/view.php deleted file mode 100644 index 80061d8..0000000 --- a/app/Views/admin/collector/view.php +++ /dev/null @@ -1,17 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?>getFieldView($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?>
-
-
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/collector/create_form.php b/app/Views/admin/create_form.php similarity index 98% rename from app/Views/admin/collector/create_form.php rename to app/Views/admin/create_form.php index 82d4599..decc70a 100644 --- a/app/Views/admin/collector/create_form.php +++ b/app/Views/admin/create_form.php @@ -1,6 +1,6 @@ extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> section('content') ?> +alertTrait(session('message')) : ""; ?>
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
diff --git a/app/Views/admin/collector/download.php b/app/Views/admin/download.php similarity index 100% rename from app/Views/admin/collector/download.php rename to app/Views/admin/download.php diff --git a/app/Views/admin/mylog/index.php b/app/Views/admin/index.php similarity index 99% rename from app/Views/admin/mylog/index.php rename to app/Views/admin/index.php index 80d0a62..3e7ac4f 100644 --- a/app/Views/admin/mylog/index.php +++ b/app/Views/admin/index.php @@ -1,10 +1,10 @@ extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> section('content') ?> +alertTrait(session('message')) : ""; ?>
include("{$layouts['path']}/top"); ?>
diff --git a/app/Views/admin/traffic/modify_form.php b/app/Views/admin/modify_form.php similarity index 98% rename from app/Views/admin/traffic/modify_form.php rename to app/Views/admin/modify_form.php index 040274f..2960392 100644 --- a/app/Views/admin/traffic/modify_form.php +++ b/app/Views/admin/modify_form.php @@ -1,6 +1,6 @@ extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> section('content') ?> +alertTrait(session('message')) : ""; ?>
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
diff --git a/app/Views/admin/mylog/create_form.php b/app/Views/admin/mylog/create_form.php deleted file mode 100644 index 82d4599..0000000 --- a/app/Views/admin/mylog/create_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- -
- $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['formDatas'][$field] ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/mylog/download.php b/app/Views/admin/mylog/download.php deleted file mode 100644 index c835c18..0000000 --- a/app/Views/admin/mylog/download.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - $label): ?> - - - - - - - - - - - - - - -
getHelper()->getFieldView($field, $entity->$field, $viewDatas) ?>
\ No newline at end of file diff --git a/app/Views/admin/mylog/modify_form.php b/app/Views/admin/mylog/modify_form.php deleted file mode 100644 index 040274f..0000000 --- a/app/Views/admin/mylog/modify_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/mylog/view.php b/app/Views/admin/mylog/view.php deleted file mode 100644 index 80061d8..0000000 --- a/app/Views/admin/mylog/view.php +++ /dev/null @@ -1,17 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?>getFieldView($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?>
-
-
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/traffic/create_form.php b/app/Views/admin/traffic/create_form.php deleted file mode 100644 index 82d4599..0000000 --- a/app/Views/admin/traffic/create_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['formDatas'][$field] ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/traffic/download.php b/app/Views/admin/traffic/download.php deleted file mode 100644 index c835c18..0000000 --- a/app/Views/admin/traffic/download.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - $label): ?> - - - - - - - - - - - - - - -
getHelper()->getFieldView($field, $entity->$field, $viewDatas) ?>
\ No newline at end of file diff --git a/app/Views/admin/traffic/index.php b/app/Views/admin/traffic/index.php deleted file mode 100644 index 80d0a62..0000000 --- a/app/Views/admin/traffic/index.php +++ /dev/null @@ -1,59 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> - -section('content') ?> -
include("{$layouts['path']}/top"); ?>
- - - - - -
include("{$layouts['path']}/left_menu"); ?> -
include("{$template}/index_header"); ?>
-
- -
- include("{$template}/index_content_filter"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - $label): ?> - - - - - - - - - getStatus() === DEFAULTS['STATUS']; - $rowClass = $isDefaultStatus ? "" : 'class="table-danger"'; - $num = $viewDatas['index_totalcount'] - (($viewDatas['page'] - 1) * $viewDatas['perpage'] + $cnt); - ?> - > - - $label): ?> - - - - - -
번호getListLabel($field, $label, $viewDatas) ?>작업
getListButton('modify', $num, $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("{$template}/index_content_bottom"); ?> - -
-
-
include("{$template}/index_footer"); ?>
-
-
include("{$layouts['path']}/bottom"); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/create_form.php b/app/Views/admin/user/create_form.php deleted file mode 100644 index 82d4599..0000000 --- a/app/Views/admin/user/create_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['formDatas'][$field] ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/download.php b/app/Views/admin/user/download.php deleted file mode 100644 index c835c18..0000000 --- a/app/Views/admin/user/download.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - $label): ?> - - - - - - - - - - - - - - -
getHelper()->getFieldView($field, $entity->$field, $viewDatas) ?>
\ No newline at end of file diff --git a/app/Views/admin/user/index.php b/app/Views/admin/user/index.php deleted file mode 100644 index 80d0a62..0000000 --- a/app/Views/admin/user/index.php +++ /dev/null @@ -1,59 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> - -section('content') ?> -
include("{$layouts['path']}/top"); ?>
- - - - - -
include("{$layouts['path']}/left_menu"); ?> -
include("{$template}/index_header"); ?>
-
- -
- include("{$template}/index_content_filter"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - $label): ?> - - - - - - - - - getStatus() === DEFAULTS['STATUS']; - $rowClass = $isDefaultStatus ? "" : 'class="table-danger"'; - $num = $viewDatas['index_totalcount'] - (($viewDatas['page'] - 1) * $viewDatas['perpage'] + $cnt); - ?> - > - - $label): ?> - - - - - -
번호getListLabel($field, $label, $viewDatas) ?>작업
getListButton('modify', $num, $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("{$template}/index_content_bottom"); ?> - -
-
-
include("{$template}/index_footer"); ?>
-
-
include("{$layouts['path']}/bottom"); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/modify_form.php b/app/Views/admin/user/modify_form.php deleted file mode 100644 index 040274f..0000000 --- a/app/Views/admin/user/modify_form.php +++ /dev/null @@ -1,22 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?> - getFieldForm($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?> -
-
-
"btn btn-outline btn-primary")); ?>
- -
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/user/view.php b/app/Views/admin/user/view.php deleted file mode 100644 index 80061d8..0000000 --- a/app/Views/admin/user/view.php +++ /dev/null @@ -1,17 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> -section('content') ?> -
-
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- - $label): ?> - - - - - -
getFieldLabel($field, $label, $viewDatas) ?>getFieldView($field, old($field) ?? ($viewDatas['entity']->$field ?? null), $viewDatas) ?>
-
-
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
-
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/traffic/view.php b/app/Views/admin/view.php similarity index 97% rename from app/Views/admin/traffic/view.php rename to app/Views/admin/view.php index 80061d8..81d484c 100644 --- a/app/Views/admin/traffic/view.php +++ b/app/Views/admin/view.php @@ -1,6 +1,6 @@ extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -alertTrait(session('message')) : "" ?> section('content') ?> +alertTrait(session('message')) : ""; ?>
include("templates/{$viewDatas['layout']}/form_content_top"); ?>