diff --git a/app/Controllers/Admin/BoardController.php b/app/Controllers/Admin/BoardController.php index f6be0f6..a3bca13 100644 --- a/app/Controllers/Admin/BoardController.php +++ b/app/Controllers/Admin/BoardController.php @@ -80,7 +80,7 @@ class BoardController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/AccountController.php b/app/Controllers/Admin/Customer/AccountController.php index 88b79e5..75d10d0 100644 --- a/app/Controllers/Admin/Customer/AccountController.php +++ b/app/Controllers/Admin/Customer/AccountController.php @@ -58,7 +58,7 @@ class AccountController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index 3f0dd45..c917fce 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -67,7 +67,7 @@ class ClientController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/CouponController.php b/app/Controllers/Admin/Customer/CouponController.php index 79866a7..0c65cfb 100644 --- a/app/Controllers/Admin/Customer/CouponController.php +++ b/app/Controllers/Admin/Customer/CouponController.php @@ -58,7 +58,7 @@ class CouponController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/PointController.php b/app/Controllers/Admin/Customer/PointController.php index 78db64f..ded2fe8 100644 --- a/app/Controllers/Admin/Customer/PointController.php +++ b/app/Controllers/Admin/Customer/PointController.php @@ -54,7 +54,7 @@ class PointController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 153e38d..a90d7af 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -82,7 +82,7 @@ class ServiceController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/LineController.php b/app/Controllers/Admin/Equipment/LineController.php index 78c6444..db4fbeb 100644 --- a/app/Controllers/Admin/Equipment/LineController.php +++ b/app/Controllers/Admin/Equipment/LineController.php @@ -56,7 +56,7 @@ class LineController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index cd3a4c6..0647a3c 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -59,7 +59,7 @@ class ServerController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/ServerPartController.php b/app/Controllers/Admin/Equipment/ServerPartController.php index 18b7112..a3920a1 100644 --- a/app/Controllers/Admin/Equipment/ServerPartController.php +++ b/app/Controllers/Admin/Equipment/ServerPartController.php @@ -60,7 +60,7 @@ class ServerPartController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/MylogController.php b/app/Controllers/Admin/MylogController.php index 377ebab..1fa601d 100644 --- a/app/Controllers/Admin/MylogController.php +++ b/app/Controllers/Admin/MylogController.php @@ -45,7 +45,7 @@ class MylogController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/CPUController.php b/app/Controllers/Admin/Part/CPUController.php index 3e1c047..b591e65 100644 --- a/app/Controllers/Admin/Part/CPUController.php +++ b/app/Controllers/Admin/Part/CPUController.php @@ -52,7 +52,7 @@ class CPUController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/CSController.php b/app/Controllers/Admin/Part/CSController.php index 53db67c..ae6b86d 100644 --- a/app/Controllers/Admin/Part/CSController.php +++ b/app/Controllers/Admin/Part/CSController.php @@ -13,7 +13,7 @@ class CSController extends PartController { parent::initController($request, $response, $logger); if ($this->service === null) { - $this->service = service('part_softwareservice'); + $this->service = service('part_csservice'); } $this->addActionPaths('cs'); } @@ -79,7 +79,7 @@ class CSController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/DISKController.php b/app/Controllers/Admin/Part/DISKController.php index 1fd614a..4d0772b 100644 --- a/app/Controllers/Admin/Part/DISKController.php +++ b/app/Controllers/Admin/Part/DISKController.php @@ -23,7 +23,6 @@ class DISKController extends PartController "title", "price", "stock", - "format", ]; $filters = [ "status", @@ -34,16 +33,17 @@ class DISKController extends PartController switch ($action) { case 'create': case 'create_form': + break; case 'modify': case 'modify_form': - $fields = [...$fields, 'status']; + $fields = [...$fields, "format", 'status']; break; case 'view': - $fields = [...$fields, 'status', 'created_at']; + $fields = [...$fields, "format", 'status', 'created_at']; break; case 'index': case 'download': - $fields = [...$fields, 'status', 'created_at']; + $fields = [...$fields, "format", 'status', 'created_at']; break; default: throw new \Exception("[{$action}] 지원하지 않는 action입니다."); @@ -53,7 +53,7 @@ class DISKController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action);; } diff --git a/app/Controllers/Admin/Part/IPController.php b/app/Controllers/Admin/Part/IPController.php index 8a9edb5..545868b 100644 --- a/app/Controllers/Admin/Part/IPController.php +++ b/app/Controllers/Admin/Part/IPController.php @@ -13,7 +13,7 @@ class IPController extends PartController { parent::initController($request, $response, $logger); if ($this->service === null) { - $this->service = service('part_softwareservice'); + $this->service = service('part_ipservice'); } $this->addActionPaths('ip'); } @@ -70,7 +70,7 @@ class IPController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/RAMController.php b/app/Controllers/Admin/Part/RAMController.php index dd694ce..e691925 100644 --- a/app/Controllers/Admin/Part/RAMController.php +++ b/app/Controllers/Admin/Part/RAMController.php @@ -52,7 +52,7 @@ class RAMController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/SOFTWAREController.php b/app/Controllers/Admin/Part/SOFTWAREController.php index c8d50e3..e8eeb8a 100644 --- a/app/Controllers/Admin/Part/SOFTWAREController.php +++ b/app/Controllers/Admin/Part/SOFTWAREController.php @@ -52,7 +52,7 @@ class SOFTWAREController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/SWITCHController.php b/app/Controllers/Admin/Part/SWITCHController.php index 3554022..b2461d9 100644 --- a/app/Controllers/Admin/Part/SWITCHController.php +++ b/app/Controllers/Admin/Part/SWITCHController.php @@ -13,7 +13,7 @@ class SWITCHController extends PartController { parent::initController($request, $response, $logger); if ($this->service === null) { - $this->service = service('part_softwareservice'); + $this->service = service('part_switchservice'); } $this->addActionPaths('switch'); } @@ -71,7 +71,7 @@ class SWITCHController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/PaymentController.php b/app/Controllers/Admin/PaymentController.php index 615d6db..8eecf28 100644 --- a/app/Controllers/Admin/PaymentController.php +++ b/app/Controllers/Admin/PaymentController.php @@ -29,7 +29,7 @@ class PaymentController extends AdminController "content ", ]; $filters = ['user_uid', 'clientinfo_uid', 'serviceinfo_uid', 'status', 'billing', 'pay']; - $indexFilter = $filters; + $indexFilter = ['serviceinfo_uid', 'status', 'billing']; $batchjobFilters = ['status']; switch ($action) { case 'create': @@ -81,7 +81,7 @@ class PaymentController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 69071ca..b27c34a 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -55,7 +55,7 @@ class UserController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); - $this->service->getFormService()->getIndexFilters($indexFilter); + $this->service->getFormService()->setIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 02de942..0b29566 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -151,8 +151,8 @@ abstract class CommonController extends AbstractCRUDController $value = $this->request->getVar($field) ?? null; if ($value) { $this->service->setFilter($field, $value); - $index_filters[$field] = $value; } + $index_filters[$field] = $value; } $this->addViewDatas('index_filters', $index_filters); diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index 94ca74f..a7fce30 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -63,7 +63,6 @@ abstract class CommonForm $formOptions[$field] = $formOptions[$field] ?? $this->getFormOption($field); } $this->_formOptions = $formOptions; - // dd($this->_formOptions[$field]); } //$fields 매치된것만 반환, []->전체 final public function getFormOptions(array $fields = []): array diff --git a/app/Forms/Part/CSForm.php b/app/Forms/Part/CSForm.php index 50c7ba2..eb171e8 100644 --- a/app/Forms/Part/CSForm.php +++ b/app/Forms/Part/CSForm.php @@ -31,4 +31,21 @@ class CSForm extends PartForm } return $rule; } + public function getFormOption(string $field, array $options = ['options' => [], 'extras' => [], 'atttributes' => []]): array + { + $tempOptions = ['' => lang("{$this->getAttribute('class_path')}.label.{$field}") . " 선택"]; + switch ($field) { + case 'serverinfo_uid': + foreach (service('equipment_serverservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + $options['options'] = $tempOptions; + break; + default: + $options = parent::getFormOption($field, $options); + break; + } + return $options; + } } diff --git a/app/Forms/Part/IPForm.php b/app/Forms/Part/IPForm.php index 9120b29..522f604 100644 --- a/app/Forms/Part/IPForm.php +++ b/app/Forms/Part/IPForm.php @@ -27,4 +27,36 @@ class IPForm extends PartForm } return $rule; } + public function getFormOption(string $field, array $options = ['options' => [], 'extras' => [], 'atttributes' => []]): array + { + $tempOptions = ['' => lang("{$this->getAttribute('class_path')}.label.{$field}") . " 선택"]; + switch ($field) { + case 'lineinfo_uid': + foreach (service('equipment_lineservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + $options['options'] = $tempOptions; + break; + case 'old_clientinfo_uid': + foreach (service('customer_clientservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + // dd($tempOptions); + $options['options'] = $tempOptions; + break; + case 'serverinfo_uid': + foreach (service('equipment_serverservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + $options['options'] = $tempOptions; + break; + default: + $options = parent::getFormOption($field, $options); + break; + } + return $options; + } } diff --git a/app/Forms/Part/SWITCHForm.php b/app/Forms/Part/SWITCHForm.php index 5e9b1d7..a86d986 100644 --- a/app/Forms/Part/SWITCHForm.php +++ b/app/Forms/Part/SWITCHForm.php @@ -20,4 +20,28 @@ class SWITCHForm extends PartForm } return $rule; } + public function getFormOption(string $field, array $options = ['options' => [], 'extras' => [], 'atttributes' => []]): array + { + $tempOptions = ['' => lang("{$this->getAttribute('class_path')}.label.{$field}") . " 선택"]; + switch ($field) { + case 'serviceinfo_uid': + foreach (service('customer_serviceservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + $options['options'] = $tempOptions; + break; + case 'serverinfo_uid': + foreach (service('equipment_serverservice')->getEntities() as $entity) { + $tempOptions[$entity->getPK()] = $entity->getTitle(); + // $options['attributes'][$entity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $entity->getRole())]; + } + $options['options'] = $tempOptions; + break; + default: + $options = parent::getFormOption($field, $options); + break; + } + return $options; + } } diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 7e9bbcb..232745d 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -140,7 +140,10 @@ abstract class CommonHelper switch ($field) { case 'clientinfo_uid': if (array_key_exists($value, $viewDatas['formOptions'][$field]['options'])) { - $value = "{$viewDatas['formOptions'][$field]['options'][$value]}"; + if (!array_key_exists($value, $viewDatas['formOptions'][$field]['options'])) { + throw new \Exception(__METHOD__ . "에서 오류발생: {$field}에서 {$value}에 해당하는 값이 존재하지 않습니다."); + } + $value = !$value ? "" : "{$viewDatas['formOptions'][$field]['options'][$value]}"; } break; case 'role': @@ -173,7 +176,12 @@ abstract class CommonHelper break; default: if (in_array($field, $viewDatas['formFilters'])) { - $value = !$value ? "" : $viewDatas['formOptions'][$field]['options'][$value]; + if ($value) { + if (!array_key_exists($value, $viewDatas['formOptions'][$field]['options'])) { + throw new \Exception(__METHOD__ . "에서 오류발생: {$field}에서 {$value}에 해당하는 값이 존재하지 않습니다."); + } + $value = !$value ? "" : $viewDatas['formOptions'][$field]['options'][$value]; + } } break; } diff --git a/app/Views/templates/admin/index_content_filter.php b/app/Views/templates/admin/index_content_filter.php index 47750b0..142294a 100644 --- a/app/Views/templates/admin/index_content_filter.php +++ b/app/Views/templates/admin/index_content_filter.php @@ -2,9 +2,8 @@