diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index eabff09..658b276 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -40,10 +40,7 @@ class ServiceController extends CustomerController protected function getResultSuccess(string $message = MESSAGES["SUCCESS"], ?string $actionTemplate = null): RedirectResponse|string { switch ($this->getService()->getAction()) { - // case 'create_form': - // case 'modify_form': case 'view': - case 'index': $this->service = $this->getService(); $this->control = $this->getService()->getControlDatas(); $this->getService()->getHelper()->setViewDatas($this->getViewDatas()); diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index bbe9e8f..5f7c817 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -3,7 +3,6 @@ namespace App\Controllers\Admin\Equipment; use App\Entities\Equipment\ServerEntity; -use App\Helpers\Equipment\ServerHelper; use App\Services\Equipment\ServerService; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; @@ -32,7 +31,6 @@ class ServerController extends EquipmentController { switch ($this->getService()->getAction()) { case 'view': - case 'index': $this->service = $this->getService(); $this->control = $this->getService()->getControlDatas(); $this->getService()->getHelper()->setViewDatas($this->getViewDatas()); diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 2fd51bf..dd61812 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -70,6 +70,7 @@ class ServiceHelper extends CustomerHelper break; case 'serverinfo_uid': $value = array_key_exists('entity', $viewDatas) ? $viewDatas['entity']->getServerEntity()->getCode() : "지정된서버없음"; + $value .= view_cell("\App\Cells\Equipment\ServerPartCell::parttable", ['serverinfo_uid' => $viewDatas['entity']->getServerEntity()->getPK(), 'types' => SERVERPART['SERVICE_PARTTYPES'], 'template' => 'partservice']); break; case 'billing_at': if (array_key_exists('unPaids', $viewDatas)) { diff --git a/app/Helpers/Equipment/ServerHelper.php b/app/Helpers/Equipment/ServerHelper.php index ce4777d..cc583d3 100644 --- a/app/Helpers/Equipment/ServerHelper.php +++ b/app/Helpers/Equipment/ServerHelper.php @@ -37,6 +37,10 @@ class ServerHelper extends EquipmentHelper $value = "" . $viewDatas['control']['field_optons'][$field][$value]->getTitle() . ""; } break; + case 'title': + $value = parent::getFieldView($field, $value, $viewDatas, $extras); + $value .= "
" . view_cell("\App\Cells\Equipment\ServerPartCell::parttable", ['serverinfo_uid' => $viewDatas['entity']->getPK(), 'types' => SERVERPART['SERVER_PARTTYPES']]) . "
"; + break; case 'manufactur_at': case 'format_at': $value = $value ? date("Y-m-d", strtotime($value)) : ""; diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index ceac681..a20d362 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -27,7 +27,6 @@ class ServiceService extends CustomerService "location", "type", "clientinfo_uid", - "serverinfo_uid", "billing_at", "amount", "start_at", @@ -57,7 +56,6 @@ class ServiceService extends CustomerService 'billing_at', 'amount', 'status', - 'user_uid', 'start_at', 'updated_at', ]; @@ -70,7 +68,6 @@ class ServiceService extends CustomerService 'type', 'clientinfo_uid', 'serverinfo_uid', - 'user_uid', 'status', ]; } diff --git a/app/Views/admin/server/index.php b/app/Views/admin/server/index.php deleted file mode 100644 index c17db03..0000000 --- a/app/Views/admin/server/index.php +++ /dev/null @@ -1,117 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -getHelper()->alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- - - - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- "get"]) ?> - - - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - - - - - - - getStatus() === $entity::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>> - - - - - - - - - - - - - - - - -
번호 - getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?>/ - - getHelper()->getListLabel('serviceinfo_uid', lang("{$viewDatas['class_path']}.label.serviceinfo_uid"), $viewDatas) ?> - - getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?> - - getHelper()->getListLabel('title', lang("{$viewDatas['class_path']}.label.title"), $viewDatas) ?> - - getHelper()->getListLabel('price', lang("{$viewDatas['class_path']}.label.price"), $viewDatas) ?> - - getHelper()->getListLabel('manufactur_at', lang("{$viewDatas['class_path']}.label.manufactur_at"), $viewDatas) ?> - - getHelper()->getListLabel('format_at', lang("{$viewDatas['class_path']}.label.format_at"), $viewDatas) ?> - - getHelper()->getListLabel('status', lang("{$viewDatas['class_path']}.label.status"), $viewDatas) ?> - 부품정보작업
getHelper()->getListButton('modify', '', $viewDatas) ?> -
getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?>
-
-
getHelper()->getFieldView('serviceinfo_uid', $entity->getServiceInfoUID(), $viewDatas) ?>
-
-
getHelper()->getFieldView('type', $entity->type, $viewDatas) ?>
-
-
getHelper()->getFieldView('title', $entity->getTitle(), $viewDatas) ?>
-
-
getHelper()->getFieldView('price', $entity->price, $viewDatas) ?>
-
-
getHelper()->getFieldView('manufactur_at', $entity->manufactur_at, $viewDatas) ?>
-
-
getHelper()->getFieldView('format_at', $entity->format_at, $viewDatas) ?>
-
getHelper()->getFieldView('status', $entity->status, $viewDatas) ?> - $entity->getPK(), 'types' => SERVERPART['SERVER_PARTTYPES']]) ?> - - getHelper()->getListButton('view', '', $viewDatas) ?>  - getHelper()->getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
- - -
- -
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 deleted file mode 100644 index a8bc69b..0000000 --- a/app/Views/admin/service/index.php +++ /dev/null @@ -1,107 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -getHelper()->alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- - - - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- "get"]) ?> - - - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - - - - - - - - getStatus() === $entity::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>> - - - - - - - - - - - - - - - -
번호 - getHelper()->getListLabel('site', lang("{$viewDatas['class_path']}.label.site"), $viewDatas) ?> - - getHelper()->getListLabel('location', lang("{$viewDatas['class_path']}.label.location"), $viewDatas) ?> - - getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?> - - getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?> - - getHelper()->getListLabel('serverinfo_uid', lang("{$viewDatas['class_path']}.label.serverinfo_uid"), $viewDatas) ?>/SWITCH/IP/OS - - getHelper()->getListLabel('amount', lang("{$viewDatas['class_path']}.label.amount"), $viewDatas) ?> - - getHelper()->getListLabel('billing_at', lang("{$viewDatas['class_path']}.label.billing_at"), $viewDatas) ?> - - getHelper()->getListLabel('status', lang("{$viewDatas['class_path']}.label.status"), $viewDatas) ?> - - getHelper()->getListLabel('start_at', lang("{$viewDatas['class_path']}.label.start_at"), $viewDatas) ?> - 작업
getHelper()->getListButton('modify', $viewDatas['cnt'], $viewDatas) ?>getHelper()->getFieldView('site', $entity->site, $viewDatas) ?> - getHelper()->getFieldView('location', $entity->location, $viewDatas) ?> - getHelper()->getFieldView('type', $entity->type, $viewDatas) ?>getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?> - getHelper()->getFieldView('serverinfo_uid', $entity->getServerEntity()->getTitle() ?? "", $viewDatas) ?> / - $entity->getServerEntity()->getPK(), 'types' => SERVERPART['SERVICE_PARTTYPES'], 'template' => 'partservice']) ?> - getHelper()->getFieldView('amount', $entity->amount, $viewDatas) ?>getHelper()->getFieldView('billing_at', $entity->billing_at, $viewDatas) ?>getHelper()->getFieldView('status', $entity->status, $viewDatas) ?>getHelper()->getFieldView('start_at', $entity->start_at, $viewDatas) ?> - getHelper()->getListButton('view', '', $viewDatas) ?>  - getHelper()->getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
- - -
- -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/service/view.php b/app/Views/admin/service/view.php index f520e2a..41cf6ff 100644 --- a/app/Views/admin/service/view.php +++ b/app/Views/admin/service/view.php @@ -3,33 +3,28 @@ getHelper()->alert($error) ?>
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- -
- - - - - - - - - -
서버정보추가정보
- - - - - - - -
getHelper()->getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?> - getHelper()->getFieldView($field, $viewDatas['entity']->$field ?? null, $viewDatas) ?> - -
-
$viewDatas['entity']->getServerEntity()->getPK(), 'types' => SERVERPART['PARTTYPES']]) ?>
-
"btn btn-outline btn-primary")); ?>
- -
+ + + + + + + + + +
서버정보추가정보
+ + + + + + + +
getHelper()->getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?> + getHelper()->getFieldView($field, $viewDatas['entity']->$field ?? null, $viewDatas) ?> + +
+
$viewDatas['entity']->getServerEntity()->getPK(), 'types' => SERVERPART['PARTTYPES']]) ?>
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
endSection() ?> \ No newline at end of file