diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index f026198..f87942f 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -77,15 +77,6 @@ class ServiceController extends CustomerController 'fields' => ['clientinfo_uid', 'type', 'billing_at', 'rack', 'LINE', 'SERVER', 'IP', 'CPU', 'RAM', 'DISK', 'SOFTWARE', 'DEFENCE', 'start_at', 'status'], ]; $this->init('index', $fields); - // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임 return parent::index_process(); - // $entities = []; - // foreach (parent::index_process() as $entity) { - // $entity->setPartEntities("CPU", $this->getCpuService()->getPartEntities($entity)); - // $entity->setPartEntities("RAM", $this->getRamService()->getPartEntities($entity)); - // $entity->setPartEntities("DISK", $this->getDiskService()->getPartEntities($entity)); - // $entities[] = $entity; - // } - // return $entities; } } diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index d5acb20..84b955e 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -71,9 +71,9 @@ class ServerController extends EquipmentController // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임 $entities = []; foreach (parent::index_process() as $entity) { - $entity->setPartEntities("CPU", $this->getCpuService()->getPartEntities($entity)); - $entity->setPartEntities("RAM", $this->getRamService()->getPartEntities($entity)); - $entity->setPartEntities("DISK", $this->getDiskService()->getPartEntities($entity)); + $entity->setPartEntities("CPU", $this->getCpuService()->getAdapterEntities($entity)); + $entity->setPartEntities("RAM", $this->getRamService()->getAdapterEntities($entity)); + $entity->setPartEntities("DISK", $this->getDiskService()->getAdapterEntities($entity)); $entities[] = $entity; } return $entities; diff --git a/app/Entities/Customer/ServiceEntity.php b/app/Entities/Customer/ServiceEntity.php index 2a28cec..c474eb8 100644 --- a/app/Entities/Customer/ServiceEntity.php +++ b/app/Entities/Customer/ServiceEntity.php @@ -2,24 +2,10 @@ namespace App\Entities\Customer; -use App\Entities\Equipment\PartEntity; use App\Models\Customer\ServiceModel; class ServiceEntity extends CustomerEntity { const PK = ServiceModel::PK; const TITLE = ServiceModel::TITLE; - - public function getPartEntities(string $type): array - { - return $this->attributes[$type] ?? []; - } - public function setPartEntities(string $type, array $partEntities): void - { - if (!isset($this->attributes[$type])) { - $this->attributes[$type] = []; - } - $this->attributes[$type] = $partEntities; - // $this->attributes[$type] = array_unique($this->attributes[$type], SORT_REGULAR); - } } diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index cc81f82..6185e2d 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -13,39 +13,4 @@ class ServiceHelper extends CustomerHelper parent::__construct($request); $this->setTitleField(field: ServiceModel::TITLE); } - public function getFieldView(string $field, array $viewDatas, array $extras = []): string - { - $value = $viewDatas['entity']->$field ?? ""; - switch ($field) { - case "LINE": - case "SERVER": - case "IP": - case "CPU": - case "RAM": - case "DISK": - case "DEFENCE": - case "SOFTWARE": - $temps = []; - foreach ($viewDatas['entity']->getPartEntities($field) as $partEntity) { - $temps[] = "