From daa4d81c8098eb13d5f3f15edf2cf15dd6436f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Fri, 6 Jun 2025 16:35:43 +0900 Subject: [PATCH] dbms_init...1 --- .../Admin/Customer/CustomerController.php | 4 ++-- .../Admin/Customer/ServiceItemController.php | 4 ++-- .../Admin/Equipment/EquipmentController.php | 4 ++-- .../Admin/Equipment/Part/IpController.php | 4 ++-- .../Admin/Equipment/Part/PartController.php | 4 ++-- app/Controllers/Admin/MyLogController.php | 6 +++--- app/Controllers/CommonController.php | 6 ++++-- app/Helpers/CommonHelper.php | 16 ++++++++-------- app/Helpers/Customer/ServiceHelper.php | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/Controllers/Admin/Customer/CustomerController.php b/app/Controllers/Admin/Customer/CustomerController.php index a22c1f6..6c83547 100644 --- a/app/Controllers/Admin/Customer/CustomerController.php +++ b/app/Controllers/Admin/Customer/CustomerController.php @@ -71,7 +71,7 @@ abstract class CustomerController extends AdminController } return $this->_equipmentService[$key]; } - protected function getFormFieldOption(string $field, array $options = []): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'clientinfo_uid': @@ -98,7 +98,7 @@ abstract class CustomerController extends AdminController $options[$field] = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/Admin/Customer/ServiceItemController.php b/app/Controllers/Admin/Customer/ServiceItemController.php index b207452..801564d 100644 --- a/app/Controllers/Admin/Customer/ServiceItemController.php +++ b/app/Controllers/Admin/Customer/ServiceItemController.php @@ -46,7 +46,7 @@ class ServiceItemController extends CustomerController return $this->_serviceService; } - protected function getFormFieldOption(string $field, array $options = []): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'serviceinfo_uid': @@ -69,7 +69,7 @@ class ServiceItemController extends CustomerController $options[$field] = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/Admin/Equipment/EquipmentController.php b/app/Controllers/Admin/Equipment/EquipmentController.php index 23a10ba..03c50ea 100644 --- a/app/Controllers/Admin/Equipment/EquipmentController.php +++ b/app/Controllers/Admin/Equipment/EquipmentController.php @@ -23,7 +23,7 @@ abstract class EquipmentController extends AdminController return $this->_clientService; } //Index,FieldForm관련 - protected function getFormFieldOption(string $field, array $options): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'clientinfo_uid': @@ -34,7 +34,7 @@ abstract class EquipmentController extends AdminController $options[$field] = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/Admin/Equipment/Part/IpController.php b/app/Controllers/Admin/Equipment/Part/IpController.php index 10a3aad..f5c451e 100644 --- a/app/Controllers/Admin/Equipment/Part/IpController.php +++ b/app/Controllers/Admin/Equipment/Part/IpController.php @@ -44,7 +44,7 @@ class IpController extends PartController } return $this->_lineService; } - protected function getFormFieldOption(string $field, array $options): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'lineinfo_uid': @@ -55,7 +55,7 @@ class IpController extends PartController $options[$field] = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/Admin/Equipment/Part/PartController.php b/app/Controllers/Admin/Equipment/Part/PartController.php index 32d28b4..1dd3341 100644 --- a/app/Controllers/Admin/Equipment/Part/PartController.php +++ b/app/Controllers/Admin/Equipment/Part/PartController.php @@ -14,7 +14,7 @@ abstract class PartController extends EquipmentController { parent::initController($request, $response, $logger); } - protected function getFormFieldOption(string $field, array $options): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'clientinfo_uid': @@ -25,7 +25,7 @@ abstract class PartController extends EquipmentController $options[$field] = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/Admin/MyLogController.php b/app/Controllers/Admin/MyLogController.php index b6affa2..3b84534 100644 --- a/app/Controllers/Admin/MyLogController.php +++ b/app/Controllers/Admin/MyLogController.php @@ -46,7 +46,7 @@ class MyLogController extends AdminController return $this->_userService; } //Index,FieldForm관련 - protected function getFormFieldOption(string $field, array $options): array + protected function getFormFieldOption(string $field): array { switch ($field) { case 'user_uid': @@ -54,10 +54,10 @@ class MyLogController extends AdminController foreach ($this->getUserService()->getEntities() as $entity) { $temps[$entity->getPK()] = $entity->getTitle(); } - $options[$field] = $temps; + $options = $temps; break; default: - $options = parent::getFormFieldOption($field, $options); + $options = parent::getFormFieldOption($field); break; } return $options; diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 9f3f1a5..8ca121c 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -174,16 +174,17 @@ abstract class CommonController extends BaseController } return $rule; } - protected function getFormFieldOption(string $field, array $options): array + protected function getFormFieldOption(string $field): array { switch ($field) { default: - $options[$field] = lang($this->getService()->getClassName() . '.' . strtoupper($field)); + $options = lang($this->getService()->getClassName() . '.' . strtoupper($field)); break; } if (!is_array($options)) { throw new \Exception(__FUNCTION__ . "에서 field의 options 값이 array가 아닙니다.\n" . var_export($options, true)); } + // dd($options); return $options; } protected function setValidation(Validation $validation, string $field, string $rule): Validation @@ -240,6 +241,7 @@ abstract class CommonController extends BaseController case 'index': case 'view': $this->control = $this->_control; + // dd($this->control); $this->getHelper()->setViewDatas($this->getViewDatas()); $result = view($this->view_path . $this->getAction(), [ 'viewDatas' => $this->getViewDatas() diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 49cac52..6522ccf 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -221,19 +221,19 @@ class CommonHelper $form = form_input($field, $value ?? "", ["placeholder" => "예)010-0010-0010", ...$extras]); break; case 'role': - if (!is_array($viewDatas['control']['field_options'][$field])) { + if (!is_array($viewDatas['control']['filter_optons'][$field])) { throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $forms = []; - foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['filter_optons'][$field] as $key => $label) { $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values)) . $label; } $form = implode(" ", $forms); } else { $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['filter_optons'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); @@ -256,13 +256,13 @@ class CommonHelper case 'status': if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $forms = []; - foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['filter_optons'][$field] as $key => $label) { $forms[] = form_radio($label, $key, $key == $value) . $label; } $form = implode(" ", $forms); } else { $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['filter_optons'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); @@ -270,11 +270,11 @@ class CommonHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - if (!is_array($viewDatas['control']['field_options'][$field])) { + if (!is_array($viewDatas['control']['filter_optons'][$field])) { throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['filter_optons'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); @@ -293,7 +293,7 @@ class CommonHelper case 'role': $roles = []; foreach (explode(DEFAULTS["DELIMITER_ROLE"], $value) as $key) { - $roles[] = $viewDatas['control']['field_options'][$field][$key] ?? ""; + $roles[] = $viewDatas['control']['filter_optons'][$field][$key] ?? ""; } $value = implode(" , ", $roles); break; diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 574d1dc..401662d 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -59,7 +59,7 @@ class ServiceHelper extends CustomerHelper case "DOMAIN": $temps = ["
    "]; foreach ($viewDatas['entity']->getItemEntities($field) as $itemEntity) { - $temps[] = "
  1. getView_Price() . "\">" . $viewDatas['control']['field_options'][$field][$itemEntity->getItemUid()] . ' ' . $itemEntity->getView_BillingCycle() . ' ' . $itemEntity->getView_Sale() . "
    2. "; + $temps[] = "
  2. getView_Price() . "\">" . $viewDatas['control']['filter_optons'][$field][$itemEntity->getItemUid()] . ' ' . $itemEntity->getView_BillingCycle() . ' ' . $itemEntity->getView_Sale() . "
    3. "; } $temps[] = "
"; $value = implode("", $temps);