diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index cecce91..62152f8 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -281,7 +281,6 @@ class CommonHelper case 'old_clientinfo_uid': case 'clientinfo_uid': case 'serviceinfo_uid': - case 'serverinfo_uid': $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; $form = $this->form_dropdown_custom($field, $value, $viewDatas, $extras); break; @@ -354,8 +353,7 @@ class CommonHelper case 'clientinfo_uid': case 'serviceinfo_uid': case 'serverinfo_uid': - case 'csinfo_uid': - case 'ipinfo_uid': + case 'part_uid': $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; break; } diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index e23e96a..8cb2727 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -2,21 +2,21 @@ namespace App\Helpers\Customer; -use App\Helpers\Equipment\ServerPartHelper; +use App\Helpers\Equipment\ServerHelper; use App\Models\Customer\ServiceModel; class ServiceHelper extends CustomerHelper { - private ?ServerPartHelper $_serverPartHelper = null; + private ?ServerHelper $_serverHelper = null; public function __construct() { parent::__construct(); $this->setTitleField(field: ServiceModel::TITLE); - $this->_serverPartHelper = new ServerPartHelper(); + $this->_serverHelper = new ServerHelper(); } - private function getServerPartHelper(): ServerPartHelper + private function getServerHelper(): ServerHelper { - return $this->_serverPartHelper; + return $this->_serverHelper; } public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { @@ -37,20 +37,6 @@ class ServiceHelper extends CustomerHelper public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null { switch ($field) { - // case 'clientinfo_uid': - // $temp = parent::getFieldForm($field, $value, $viewDatas, $extras); - // $value = $temp . form_label( - // ICONS['HISTORY'], - // 'client_history', - // [ - // "data-src" => "/admin/customer/clienthistory?clientinfo_uid={$value}", - // "data-bs-toggle" => "modal", - // "data-bs-target" => "#index_action_form", - // "class" => "btn btn-outline btn-primary btn-circle", - // "target" => "_self" - // ] - // ); - // break; case 'billing_at': if (array_key_exists('unPaids', $viewDatas)) { if (array_key_exists($viewDatas['entity']->getPK(), $viewDatas['unPaids'])) { @@ -67,9 +53,8 @@ class ServiceHelper extends CustomerHelper case 'OS': case 'DB': case 'SOFTWARE': - $serverEntity = $viewDatas['entity']->getServerEntity(); - $viewDatas['serverPartEntities'] = $serverEntity->getServerPartEntities($field); - $value = $this->getServerPartHelper()->getFieldView($field, $value, $viewDatas, $extras); + $viewDatas['serverEntity'] = $viewDatas['entity']->getServerEntity(); + $value = $this->getServerHelper()->getFieldView($field, $value, $viewDatas, $extras); break; default: $value = parent::getFieldView($field, $value, $viewDatas, $extras); @@ -110,9 +95,8 @@ class ServiceHelper extends CustomerHelper case 'OS': case 'DB': case 'SOFTWARE': - $serverEntity = $viewDatas['entity']->getServerEntity(); - $viewDatas['serverPartEntities'] = $serverEntity->getServerPartEntities($action); - $action = $this->getServerPartHelper()->getListButton($action, $label, $viewDatas, $extras); + $viewDatas['serverEntity'] = $viewDatas['entity']->getServerEntity(); + $action = $this->getServerHelper()->getListButton($action, $label, $viewDatas, $extras); break; default: $action = parent::getListButton($action, $label, $viewDatas, $extras); diff --git a/app/Helpers/Equipment/ServerHelper.php b/app/Helpers/Equipment/ServerHelper.php index b421bf8..f192d54 100644 --- a/app/Helpers/Equipment/ServerHelper.php +++ b/app/Helpers/Equipment/ServerHelper.php @@ -51,10 +51,17 @@ class ServerHelper extends EquipmentHelper case 'format_at': $value = $value ? date("Y-m-d", strtotime($value)) : ""; break; + case 'SWITCH': + case 'IP': + case 'CS': case 'CPU': case 'RAM': case 'DISK': - $viewDatas['serverPartEntities'] = $viewDatas['entity']->getServerPartEntities($field); + case 'OS': + case 'DB': + case 'SOFTWARE': + $serverEntity = array_key_exists('serverEntity', $viewDatas) ? $viewDatas['serverEntity'] : $viewDatas['entity']; + $viewDatas['serverPartEntities'] = $serverEntity->getServerPartEntities($field); $value = $this->getServerPartHelper()->getFieldView($field, $value, $viewDatas, $extras); break; default: @@ -86,10 +93,17 @@ class ServerHelper extends EquipmentHelper ] ); break; + case 'SWITCH': + case 'IP': + case 'CS': case 'CPU': case 'RAM': case 'DISK': - $viewDatas['serverPartEntities'] = $viewDatas['entity']->getServerPartEntities($action); + case 'OS': + case 'DB': + case 'SOFTWARE': + $serverEntity = array_key_exists('serverEntity', $viewDatas) ? $viewDatas['serverEntity'] : $viewDatas['entity']; + $viewDatas['serverinfo_uid'] = $serverEntity->getPK(); $action = $this->getServerPartHelper()->getListButton($action, $label, $viewDatas, $extras); break; default: diff --git a/app/Helpers/Equipment/ServerPartHelper.php b/app/Helpers/Equipment/ServerPartHelper.php index 45cfe57..331391d 100644 --- a/app/Helpers/Equipment/ServerPartHelper.php +++ b/app/Helpers/Equipment/ServerPartHelper.php @@ -19,7 +19,7 @@ class ServerPartHelper extends EquipmentHelper foreach ($viewDatas['entity']->getServerPartEntities($partType) as $serverPartEntity) { //기존 입력화면에서 return 된것인지? if ($value === null && $serverPartEntity !== null) { - $value = $serverPartEntity->getPartInfoUID(); + $value = $serverPartEntity->getPartUID(); } $form .= $this->form_dropdown_custom($field, $value, $viewDatas, $extras); } @@ -31,33 +31,6 @@ class ServerPartHelper extends EquipmentHelper public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { switch ($field) { - // case 'SWITCH': - // if (array_key_exists('entity', $viewDatas)) { - // $value = $viewDatas['entity']->getSwitchEntity() !== null ? $viewDatas['entity']->getSwitchEntity()->getPK() : $value; - // } - // $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; - // $form = $this->form_dropdown_custom($field, $value, $viewDatas, $extras); - // break; - // case 'IP': - // $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; - // $form = ""; - // if (array_key_exists('entity', $viewDatas)) { - // foreach ($viewDatas['entity']->getIPEntities() as $ipEntity) { - // $form .= "
" . $this->form_dropdown_custom($field, $ipEntity->getPK(), $viewDatas, $extras) . "
"; - // } - // } - // $form .= $this->form_dropdown_custom($field, $value, $viewDatas, $extras); - // break; - // case 'CS': - // $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; - // $form = ""; - // if (array_key_exists('entity', $viewDatas)) { - // foreach ($viewDatas['entity']->getCSEntities() as $csEntity) { - // $form .= "
" . $this->form_dropdown_custom($field, $csEntity->getPK(), $viewDatas, $extras) . "
"; - // } - // } - // $form .= $this->form_dropdown_custom($field, $value, $viewDatas, $extras); - // break; case 'SWITCH': case 'IP': case 'CS': @@ -85,6 +58,10 @@ class ServerPartHelper extends EquipmentHelper $options = ["" => lang("Equipment/ServerPart.label.extra") . " 선택", ...$formOptionDatas]; $form = form_dropdown($field, $options, $value, $extras); break; + case 'part_uid': + $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; + $form = parent::getFieldForm($field, $value, $viewDatas, $extras); + break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); break; @@ -110,7 +87,7 @@ class ServerPartHelper extends EquipmentHelper ICONS['SETUP'], $field, [ - "data-src" => "/admin/equipment/serverpart/modify/{$partEntity->getPK()}?type={$field}&ActionTemplate=popup", + "data-src" => "/admin/equipment/serverpart/modify/{$partEntity->getPK()}?type={$partEntity->getType()}&ActionTemplate=popup", "data-bs-toggle" => "modal", "data-bs-target" => "#index_action_form", "class" => "btn btn-sm btn-outline btn-circle", @@ -149,21 +126,17 @@ class ServerPartHelper extends EquipmentHelper case 'OS': case 'DB': case 'SOFTWARE': - $temps = []; - foreach ($viewDatas['serverPartEntities'] as $partEntity) { - $extras = ["class" => "btn btn-sm btn-outline btn-circle", "target" => "_self", ...$extras]; - $temps[] = form_label( - $label ? $label : ICONS['SETUP'], - $action, - [ - "data-src" => "/admin/equipment/serverpart?serverinfo_uid={$partEntity->getServerInfoUID()}&type={$partEntity->getType()}&ActionTemplate=popup", - "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras, - ] - ); - } - $action = implode("
", $temps); + $extras = ["class" => "btn btn-sm btn-outline btn-circle", "target" => "_self", ...$extras]; + $action = form_label( + $label ? $label : ICONS['SETUP'], + $action, + [ + "data-src" => "/admin/equipment/serverpart?serverinfo_uid={$viewDatas['serverinfo_uid']}&type={$action}&ActionTemplate=popup", + "data-bs-toggle" => "modal", + "data-bs-target" => "#index_action_form", + ...$extras, + ] + ); break; default: $action = parent::getListButton($action, $label, $viewDatas, $extras); diff --git a/app/Language/en/Equipment/ServerPart.php b/app/Language/en/Equipment/ServerPart.php index b573d07..0469513 100644 --- a/app/Language/en/Equipment/ServerPart.php +++ b/app/Language/en/Equipment/ServerPart.php @@ -26,6 +26,9 @@ return [ "OS" => "운영체제", "DB" => "데이터베이스", "SOFTWARE" => "소프트웨어", + "SWITCH" => "스위치", + "IP" => "IP", + "CS" => "CS", ], "EXTRA" => [ 'RAID0' => "RAID0", diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index ef660bb..418428c 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -16,7 +16,18 @@
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> + "get"]) ?> + 'batchjob_form', 'method' => "post"]) ?> diff --git a/app/Views/admin/popup/index.php b/app/Views/admin/popup/index.php index 2a1872f..e3834ae 100644 --- a/app/Views/admin/popup/index.php +++ b/app/Views/admin/popup/index.php @@ -5,7 +5,18 @@
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> + "get"]) ?> + + 'batchjob_form', 'method' => "post"]) ?>
diff --git a/app/Views/admin/server/index.php b/app/Views/admin/server/index.php index 6620db5..c86f22f 100644 --- a/app/Views/admin/server/index.php +++ b/app/Views/admin/server/index.php @@ -16,7 +16,18 @@
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> + "get"]) ?> + 'batchjob_form', 'method' => "post"]) ?>
diff --git a/app/Views/admin/server/index_org.php b/app/Views/admin/server/index_org.php deleted file mode 100644 index ddeeebc..0000000 --- a/app/Views/admin/server/index_org.php +++ /dev/null @@ -1,67 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- -
- - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - - getStatus() === $viewDatas['entity']::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>> - - - - - - - - - - - -
번호getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>부품정보작업
getListButton('modify', '', $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> -
getFieldView($partType, "", $viewDatas) ?>
-
getFieldView("ipinfo_uid", "", $viewDatas) ?>
-
getFieldView("csinfo_uid", "", $viewDatas) ?>
- 		- getListButton('view', '', $viewDatas) ?>  - getListButton('history', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
- -
- -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php index d4f8eb6..67b2465 100644 --- a/app/Views/admin/service/index.php +++ b/app/Views/admin/service/index.php @@ -16,7 +16,18 @@
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> + "get"]) ?> + 'batchjob_form', 'method' => "post"]) ?> diff --git a/app/Views/admin/service/index_org.php b/app/Views/admin/service/index_org.php deleted file mode 100644 index ef660bb..0000000 --- a/app/Views/admin/service/index_org.php +++ /dev/null @@ -1,61 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- -
- - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - getStatus() === $viewDatas['entity']::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>> - - - - - - - - - - -
번호getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>작업
getListButton('modify', '', $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('history', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
- -
- -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/templates/admin/index_content_top.php b/app/Views/templates/admin/index_content_top.php index 88f6161..f5db4e3 100644 --- a/app/Views/templates/admin/index_content_top.php +++ b/app/Views/templates/admin/index_content_top.php @@ -1,23 +1,11 @@ - "get"]) ?> - - \ No newline at end of file + + \ No newline at end of file