diff --git a/app/Helpers/AuthHelper.php b/app/Helpers/AuthHelper.php index 22d7ada..7dd8a41 100644 --- a/app/Helpers/AuthHelper.php +++ b/app/Helpers/AuthHelper.php @@ -19,7 +19,7 @@ class AuthHelper extends CommonHelper switch ($field) { case 'id': case 'passwd': - $form = form_password($field, "", ["autocomplete" => $field, ...$extras]); + $form = form_password($field, "", ["id" => $field, ...$extras]); break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index a3aba9f..937a232 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -218,11 +218,11 @@ class CommonHelper } switch ($field) { case 'email': - $form = form_input($field, $value ?? "", ["placeholder" => "예)test@example.com", ...$extras]); + $form = form_input($field, $value ?? "", ["id" => $field, "placeholder" => "예)test@example.com", ...$extras]); break; case 'mobile': case 'phone': - $form = form_input($field, $value ?? "", ["placeholder" => "예)010-0010-0010", ...$extras]); + $form = form_input($field, $value ?? "", ["id" => $field, "placeholder" => "예)010-0010-0010", ...$extras]); break; case 'role': if (!is_array($viewDatas['control']['filter_optons'][$field])) { @@ -233,7 +233,7 @@ class CommonHelper $forms = []; foreach ($viewDatas['control']['filter_optons'][$field] as $key => $filterEntity) { $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); - $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values)) . $filterEntity->getTitle(); + $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values), ["id" => $field, ...$extras]) . $filterEntity->getTitle(); } $form = implode(" ", $forms); } else { @@ -241,7 +241,7 @@ class CommonHelper foreach ($viewDatas['control']['filter_optons'][$field] as $key => $filterEntity) { $formOptions[$key] = $filterEntity->getTitle(); } - $form = form_dropdown($field, $formOptions, $value, $extras); + $form = form_dropdown($field, $formOptions, $value, ["id" => $field, ...$extras]); } break; case 'expired_at': @@ -250,7 +250,7 @@ class CommonHelper case 'updated_at': case 'created_at': $extra_class = isset($extras['class']) ? $extras['class'] . ' calender' : 'calender'; - $form = form_input($field, $value ?? "", ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); + $form = form_input($field, $value ?? "", ["id" => $field, 'class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; case 'description': case 'content': @@ -272,7 +272,7 @@ class CommonHelper if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $value = $value ?? DEFAULTS['STATUS']; } - $form = form_dropdown($field, $formOptions, $value, ['class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); + $form = form_dropdown($field, $formOptions, $value, ["id" => $field, 'class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); } else { $form = form_input($field, $value ?? "", $extras); } diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 2864608..62da6d7 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -57,7 +57,7 @@ class ServiceHelper extends CustomerHelper throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } //CodeIgniter 4의 form_dropdown()은 options 배열로만 값을 받기 때문에, disabled 속성 같은 개별 옵션에 대한 HTML 속성 추가는 기본적으로 지원하지 않습니다. - $form_temps = [""]; $form_temps[] = ""; foreach ($viewDatas['control']['filter_optons'][$field] as $key => $filterEntity) { $disabled = $filterEntity->getStatus() === SwitchEntity::STATUS_OCCUPIED ? 'disabled="disabled"' : ''; @@ -78,7 +78,7 @@ class ServiceHelper extends CustomerHelper throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } //CodeIgniter 4의 form_dropdown()은 options 배열로만 값을 받기 때문에, disabled 속성 같은 개별 옵션에 대한 HTML 속성 추가는 기본적으로 지원하지 않습니다. - $form_temps = [""]; $form_temps[] = ""; foreach ($viewDatas['control']['filter_optons'][$field] as $key => $filterEntity) { $disabled = $filterEntity->getStatus() === CodeEntity::STATUS_OCCUPIED ? 'disabled="disabled"' : ''; diff --git a/app/Helpers/Customer/ServiceItemHelper.php b/app/Helpers/Customer/ServiceItemHelper.php index 9557e65..98482ea 100644 --- a/app/Helpers/Customer/ServiceItemHelper.php +++ b/app/Helpers/Customer/ServiceItemHelper.php @@ -29,7 +29,7 @@ class ServiceItemHelper extends CustomerHelper throw new \Exception(__METHOD__ . "에서 {$item_type}의 field_options가 array형태가 아닙니다."); } //CodeIgniter 4의 form_dropdown()은 options 배열로만 값을 받기 때문에, disabled 속성 같은 개별 옵션에 대한 HTML 속성 추가는 기본적으로 지원하지 않습니다. - $form_temps = [""]; $form_temps[] = ""; foreach ($viewDatas['control']['filter_optons'][$item_type] as $key => $filterEntity) { $disabled = $filterEntity->getStatus() === IpEntity::STATUS_OCCUPIED ? 'disabled="disabled"' : ''; @@ -50,7 +50,7 @@ class ServiceItemHelper extends CustomerHelper throw new \Exception(__METHOD__ . "에서 {$item_type}의 field_options가 array형태가 아닙니다."); } //CodeIgniter 4의 form_dropdown()은 options 배열로만 값을 받기 때문에, disabled 속성 같은 개별 옵션에 대한 HTML 속성 추가는 기본적으로 지원하지 않습니다. - $form_temps = [""]; $form_temps[] = ""; foreach ($viewDatas['control']['filter_optons'][$item_type] as $key => $filterEntity) { $disabled = $filterEntity->getStatus() === DomainEntity::STATUS_OCCUPIED ? 'disabled="disabled"' : ''; @@ -78,7 +78,7 @@ class ServiceItemHelper extends CustomerHelper throw new \Exception(__METHOD__ . "에서 {$item_type}의 field_options가 array형태가 아닙니다."); } //CodeIgniter 4의 form_dropdown()은 options 배열로만 값을 받기 때문에, disabled 속성 같은 개별 옵션에 대한 HTML 속성 추가는 기본적으로 지원하지 않습니다. - $form_temps = [""]; $form_temps[] = ""; foreach ($viewDatas['control']['filter_optons'][$item_type] as $key => $filterEntity) { $disabled = ''; diff --git a/app/Helpers/Equipment/Part/DomainHelper.php b/app/Helpers/Equipment/Part/DomainHelper.php index 258f658..876e1d9 100644 --- a/app/Helpers/Equipment/Part/DomainHelper.php +++ b/app/Helpers/Equipment/Part/DomainHelper.php @@ -11,4 +11,21 @@ class DomainHelper extends PartHelper parent::__construct(); $this->setTitleField(field: DomainModel::TITLE); } + + public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string + { + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + } + switch ($field) { + case 'domain': + $form = form_input($field, "", ["id" => $field, "placeholder" => "예)domain.co.kr", ...$extras]); + $form .= "
"; + break; + default: + $form = parent::getFieldForm($field, $value, $viewDatas, $extras); + break; + } + return $form; + } // } diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php index 0f28f11..b92bba9 100644 --- a/app/Helpers/UserHelper.php +++ b/app/Helpers/UserHelper.php @@ -19,7 +19,7 @@ class UserHelper extends CommonHelper switch ($field) { case 'passwd': case 'confirmpassword': - $form = form_password($field, "", ["autocomplete" => $field, ...$extras]); + $form = form_password($field, "", ["id" => $field, ...$extras]); break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); diff --git a/app/Views/templates/admin/form_content_top.php b/app/Views/templates/admin/form_content_top.php index c99bff5..d93f8c7 100644 --- a/app/Views/templates/admin/form_content_top.php +++ b/app/Views/templates/admin/form_content_top.php @@ -1,9 +1,49 @@ + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/public/assets/tagify b/public/assets/tagify new file mode 160000 index 0000000..3c49093 --- /dev/null +++ b/public/assets/tagify @@ -0,0 +1 @@ +Subproject commit 3c49093fba26029602a5dc56676af3504e74dd3a