diff --git a/app/Forms/BoardForm.php b/app/Forms/BoardForm.php index f399bc7..59d274b 100644 --- a/app/Forms/BoardForm.php +++ b/app/Forms/BoardForm.php @@ -28,13 +28,6 @@ class BoardForm extends CommonForm $indexFilter = $filters; $batchjobFilters = ['user_uid', 'category', 'status']; switch ($action) { - case 'create': - case 'create_form': - break; - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [ 'category', diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index c9fc7e3..aff5df4 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -426,10 +426,8 @@ abstract class CommonForm case "user_uid": $formRules[$field] = "required|numeric"; break; - case "clientinfo_uid": - case "serviceinfo_uid": - case "serverinfo_uid": - $formRules[$field] = "permit_empty|numeric"; + case "status": + $formRules[$field] = "required|trim|string"; break; case 'picture': $formRules[$field] = "is_image[{$field}]|mime_in[{$field},image/jpg,image/jpeg,image/gif,image/png,image/webp]|max_size[{$field},300]|max_dims[{$field},2048,768]"; diff --git a/app/Forms/Customer/ClientForm.php b/app/Forms/Customer/ClientForm.php index a02b8c3..92d68c1 100644 --- a/app/Forms/Customer/ClientForm.php +++ b/app/Forms/Customer/ClientForm.php @@ -26,9 +26,6 @@ class ClientForm extends CustomerForm $indexFilter = $filters; $batchjobFilters = ['site', 'role', 'status']; switch ($action) { - case 'create': - case 'create_form': - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; @@ -81,9 +78,6 @@ class ClientForm extends CustomerForm case "point_balance": $formRules[$field] = "permit_empty|numeric"; break; - case "status": - $formRules[$field] = "required|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break; diff --git a/app/Forms/Customer/ServiceForm.php b/app/Forms/Customer/ServiceForm.php index 88c2b50..bbf0357 100644 --- a/app/Forms/Customer/ServiceForm.php +++ b/app/Forms/Customer/ServiceForm.php @@ -42,11 +42,6 @@ class ServiceForm extends CustomerForm 'status' ]; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - break; case 'view': $fields = [...$fields, 'created_at']; break; @@ -91,7 +86,6 @@ class ServiceForm extends CustomerForm break; case "site": case "location": - case "status": $formRules[$field] = "required|trim|string"; break; case "billing_at": diff --git a/app/Forms/Customer/Wallet/AccountForm.php b/app/Forms/Customer/Wallet/AccountForm.php index e707b4e..acb45a6 100644 --- a/app/Forms/Customer/Wallet/AccountForm.php +++ b/app/Forms/Customer/Wallet/AccountForm.php @@ -31,13 +31,6 @@ class AccountForm extends WalletForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = []; switch ($action) { - case 'create': - case 'create_form': - break; - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'created_at']; break; diff --git a/app/Forms/Customer/Wallet/CouponForm.php b/app/Forms/Customer/Wallet/CouponForm.php index 89946f4..f69b662 100644 --- a/app/Forms/Customer/Wallet/CouponForm.php +++ b/app/Forms/Customer/Wallet/CouponForm.php @@ -27,11 +27,6 @@ class CouponForm extends WalletForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = []; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - break; case 'view': $fields = [...$fields, 'created_at']; break; diff --git a/app/Forms/Customer/Wallet/PointForm.php b/app/Forms/Customer/Wallet/PointForm.php index 0248cf1..dbb6411 100644 --- a/app/Forms/Customer/Wallet/PointForm.php +++ b/app/Forms/Customer/Wallet/PointForm.php @@ -27,11 +27,6 @@ class PointForm extends WalletForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = []; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - break; case 'view': $fields = [...$fields, 'created_at']; break; diff --git a/app/Forms/Customer/Wallet/WalletForm.php b/app/Forms/Customer/Wallet/WalletForm.php index 0c2a01e..c89365d 100644 --- a/app/Forms/Customer/Wallet/WalletForm.php +++ b/app/Forms/Customer/Wallet/WalletForm.php @@ -20,14 +20,13 @@ abstract class WalletForm extends CustomerForm $formRules[$field] = "required|numeric"; break; case "title": - case "status": $formRules[$field] = "required|trim|string"; break; case "content": $formRules[$field] = "permit_empty|trim|string"; break; default: - $formRules = parent::getFormRule($action, $field, $formRules); + $formRules = parent::getFormRule($action, $field, $formRules); break; } return $formRules; diff --git a/app/Forms/Equipment/CHASSISForm.php b/app/Forms/Equipment/CHASSISForm.php index 13e5c83..e4b7ee6 100644 --- a/app/Forms/Equipment/CHASSISForm.php +++ b/app/Forms/Equipment/CHASSISForm.php @@ -21,6 +21,7 @@ class CHASSISForm extends EquipmentForm "ram_cnt", "diskinfo_uid", "disk_cnt", + "status" ]; $filters = [ "cpuinfo_uid", @@ -33,12 +34,6 @@ class CHASSISForm extends EquipmentForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = ['batchjob' => '일괄처리']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; diff --git a/app/Forms/Equipment/LineForm.php b/app/Forms/Equipment/LineForm.php index 21cc6fa..488f157 100644 --- a/app/Forms/Equipment/LineForm.php +++ b/app/Forms/Equipment/LineForm.php @@ -28,12 +28,6 @@ class LineForm extends EquipmentForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = []; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; @@ -57,7 +51,6 @@ class LineForm extends EquipmentForm case "bandwith": case "type": case "protocol": - case "status": case "start_at": $formRules[$field] = "required|trim|string"; break; diff --git a/app/Forms/Equipment/ServerForm.php b/app/Forms/Equipment/ServerForm.php index 4344f88..3b5dd0a 100644 --- a/app/Forms/Equipment/ServerForm.php +++ b/app/Forms/Equipment/ServerForm.php @@ -23,6 +23,7 @@ class ServerForm extends EquipmentForm "price", "manufactur_at", "format_at", + "status", ]; $filters = [ "clientinfo_uid", @@ -37,12 +38,6 @@ class ServerForm extends EquipmentForm $indexFilter = $filters; $batchjobFilters = ['type', 'switchinfo_uid', 'ip', 'viewer', 'os', 'status']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = ['clientinfo_uid', ...$fields, 'status', 'created_at']; break; @@ -87,7 +82,6 @@ class ServerForm extends EquipmentForm $formRules[$field] = "required|numeric"; break; case "type": - case "status": $formRules[$field] = "required|trim|string"; break; case "ip": //ipv4 , ipv6 , both(ipv4,ipv6) diff --git a/app/Forms/Equipment/ServerPartForm.php b/app/Forms/Equipment/ServerPartForm.php index 34d535a..5c283d6 100644 --- a/app/Forms/Equipment/ServerPartForm.php +++ b/app/Forms/Equipment/ServerPartForm.php @@ -20,6 +20,7 @@ class ServerPartForm extends EquipmentForm "cnt", "extra", "amount", + "status" ]; $filters = [ "serverinfo_uid", @@ -34,11 +35,6 @@ class ServerPartForm extends EquipmentForm ]; $batchjobFilters = ['billing', 'type']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - break; case 'view': $fields = [...$fields, 'created_at']; break; diff --git a/app/Forms/MylogForm.php b/app/Forms/MylogForm.php index c5bc3d7..a54e51d 100644 --- a/app/Forms/MylogForm.php +++ b/app/Forms/MylogForm.php @@ -12,16 +12,11 @@ class MylogForm extends CommonForm } public function action_init_process(string $action, array &$formDatas = []): void { - $fields = ['title', 'content']; - $filters = ['user_uid']; + $fields = ['title', 'content', 'status']; + $filters = ['user_uid', 'status']; $indexFilter = $filters; $batchjobFilters = $filters; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; @@ -44,7 +39,6 @@ class MylogForm extends CommonForm $formRules[$field] = "required|int"; break; case "title": - case "status": $formRules[$field] = "required|trim|string"; break; case "content": diff --git a/app/Forms/Part/CPUForm.php b/app/Forms/Part/CPUForm.php index bce4709..bb81097 100644 --- a/app/Forms/Part/CPUForm.php +++ b/app/Forms/Part/CPUForm.php @@ -15,6 +15,7 @@ class CPUForm extends PartForm "price", "used", "stock", + "status" ]; $filters = [ "status", @@ -22,12 +23,6 @@ class CPUForm extends PartForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; diff --git a/app/Forms/Part/CSForm.php b/app/Forms/Part/CSForm.php index c9cef6f..34c528a 100644 --- a/app/Forms/Part/CSForm.php +++ b/app/Forms/Part/CSForm.php @@ -16,6 +16,7 @@ class CSForm extends PartForm "accountid", "domain", "price", + "status" ]; $filters = [ "clientinfo_uid", @@ -26,12 +27,6 @@ class CSForm extends PartForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [ ...$fields, @@ -82,9 +77,6 @@ class CSForm extends PartForm case "domain": $formRules[$field] = "permit_empty|trim|string"; break; - case "status": - $formRules[$field] = "required|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break; diff --git a/app/Forms/Part/DISKForm.php b/app/Forms/Part/DISKForm.php index fc75f8d..5537ba0 100644 --- a/app/Forms/Part/DISKForm.php +++ b/app/Forms/Part/DISKForm.php @@ -16,6 +16,7 @@ class DISKForm extends PartForm "used", "format", "stock", + "status", ]; $filters = [ "status", @@ -23,13 +24,6 @@ class DISKForm extends PartForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - break; - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; diff --git a/app/Forms/Part/IPForm.php b/app/Forms/Part/IPForm.php index 1f780ee..a273723 100644 --- a/app/Forms/Part/IPForm.php +++ b/app/Forms/Part/IPForm.php @@ -29,12 +29,6 @@ class IPForm extends PartForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = ['batchjob' => '일괄처리']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [ 'clientinfo_uid', @@ -98,9 +92,6 @@ class IPForm extends PartForm case "ip": //ipv4 , ipv6 , both(ipv4,ipv6) $formRules[$field] = sprintf("required|trim|valid_ip[both]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; - case "status": - $formRules[$field] = "required|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break; diff --git a/app/Forms/Part/PartForm.php b/app/Forms/Part/PartForm.php index 9ef8ad1..9dc380d 100644 --- a/app/Forms/Part/PartForm.php +++ b/app/Forms/Part/PartForm.php @@ -26,9 +26,6 @@ abstract class PartForm extends CommonForm case "used": $formRules[$field] = "required|numeric"; break; - case "status": - $formRules[$field] = "permit_empty|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break; diff --git a/app/Forms/Part/RAMForm.php b/app/Forms/Part/RAMForm.php index fed41d7..9ce2bf6 100644 --- a/app/Forms/Part/RAMForm.php +++ b/app/Forms/Part/RAMForm.php @@ -15,6 +15,7 @@ class RAMForm extends PartForm "price", "used", "stock", + "status" ]; $filters = [ "status", @@ -22,12 +23,6 @@ class RAMForm extends PartForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; diff --git a/app/Forms/Part/SOFTWAREForm.php b/app/Forms/Part/SOFTWAREForm.php index 9cc6370..79b7f4e 100644 --- a/app/Forms/Part/SOFTWAREForm.php +++ b/app/Forms/Part/SOFTWAREForm.php @@ -15,6 +15,7 @@ class SOFTWAREForm extends PartForm "price", "used", "stock", + "status" ]; $filters = [ "status", @@ -22,12 +23,6 @@ class SOFTWAREForm extends PartForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [...$fields, 'status']; - break; case 'view': $fields = [...$fields, 'status', 'created_at']; break; diff --git a/app/Forms/Part/SWITCHForm.php b/app/Forms/Part/SWITCHForm.php index e61f1c7..aa458fc 100644 --- a/app/Forms/Part/SWITCHForm.php +++ b/app/Forms/Part/SWITCHForm.php @@ -13,6 +13,7 @@ class SWITCHForm extends PartForm $fields = [ "code", "price", + "status" ]; $filters = [ 'clientinfo_uid', @@ -25,15 +26,6 @@ class SWITCHForm extends PartForm $actionButtons = ['view' => ICONS['SEARCH']]; $batchjobButtons = ['batchjob' => '일괄처리']; switch ($action) { - case 'create': - case 'create_form': - case 'modify': - case 'modify_form': - $fields = [ - ...$fields, - 'status', - ]; - break; case 'view': $fields = [ ...$fields, @@ -68,9 +60,6 @@ class SWITCHForm extends PartForm public function getFormRule(string $action, string $field, array $formRules): array { switch ($field) { - case "status": - $formRules[$field] = "required|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break; diff --git a/app/Forms/PaymentForm.php b/app/Forms/PaymentForm.php index c391695..1819aeb 100644 --- a/app/Forms/PaymentForm.php +++ b/app/Forms/PaymentForm.php @@ -28,12 +28,6 @@ class PaymentForm extends CommonForm $actionButtons = ['paid' => '결제', 'view' => ICONS['SEARCH']]; $batchjobButtons = ['batchjob' => '일괄결제', 'invoice' => '청구서발행']; switch ($action) { - case 'create': - case 'create_form': - break; - case 'modify': - case 'modify_form': - break; case 'view': $fields = [ 'clientinfo_uid', @@ -93,7 +87,6 @@ class PaymentForm extends CommonForm case "title": case "billing": case "pay": - case "status": $formRules[$field] = "required|trim|string"; break; case "billing_at": diff --git a/app/Forms/UserForm.php b/app/Forms/UserForm.php index 4ff9d63..a8ab106 100644 --- a/app/Forms/UserForm.php +++ b/app/Forms/UserForm.php @@ -26,9 +26,6 @@ class UserForm extends CommonForm $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { - case 'create': - case 'create_form': - break; case 'view': $fields = ['id', 'name', 'email', 'mobile', 'role', 'status', 'created_at']; break; @@ -63,9 +60,6 @@ class UserForm extends CommonForm $formRules[$field] = 'required|is_array|at_least_one'; $formRules['role.*'] = 'permit_empty|trim|in_list[manager,cloudflare,firewall,security,director,master]'; break; - case "status": - $formRules[$field] = "required|trim|string"; - break; default: $formRules = parent::getFormRule($action, $field, $formRules); break;