diff --git a/app/Cells/Customer/ServiceCell.php b/app/Cells/Customer/ServiceCell.php index 41d3c8d..66461ce 100644 --- a/app/Cells/Customer/ServiceCell.php +++ b/app/Cells/Customer/ServiceCell.php @@ -4,7 +4,6 @@ namespace App\Cells\Customer; use App\Services\Customer\PaymentService; use App\Services\Customer\ServiceService; -use App\Services\Equipment\ServerPartService; class ServiceCell extends CustomerCell { diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index 438c912..a683b5c 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -40,7 +40,7 @@ class ClientController extends CustomerController // 생성 후, Client 코드값 재정의 $format = env("Client.Prefix.{$formDatas['site']}.code.format", false); if (!$format) { - throw new \Exception(__METHOD__ . "에서 code의 prefix가 정의되지 않았습니다."); + throw new \Exception(__METHOD__ . "에서 code의 code의 format[Client.Prefix.{$formDatas['site']}.code.format] 정의되지 않았습니다."); } $this->getService()->modify( $entity, diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index d9b71bd..1d26eed 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -64,11 +64,11 @@ class ServiceController extends CustomerController //생성관련 protected function create_form_process(): void { + //Form 기본값정의 $format = env("Server.Prefix.code.format", false); if (!$format) { throw new \Exception(__METHOD__ . "에서 code의 format[Server.Prefix.code.format]이 정의되지 않았습니다."); } - //기본값정의 $this->getService()->setFormDatas([ 'location' => 'chiba', 'type' => 'normal', diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index f55f9e1..26b71ee 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -52,11 +52,11 @@ class ServerController extends EquipmentController //생성 protected function create_form_process(): void { + //Form 기본값정의 $format = env("Server.Prefix.code.format", false); if (!$format) { throw new \Exception(__METHOD__ . "에서 code의 format[Server.Prefix.code.format]이 정의되지 않았습니다."); } - //기본값정의 $this->getService()->setFormDatas([ 'code' => $this->getService()->getLastestCode( $format, diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php index 3c86fbb..71f93f1 100644 --- a/app/Controllers/Admin/Home.php +++ b/app/Controllers/Admin/Home.php @@ -63,8 +63,11 @@ class Home extends AdminController public function index(): RedirectResponse|string { $this->getService()->setAction(__FUNCTION__); + //기본전달값정의 + $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFields(); $this->getService()->setFormFilters(); + $this->getService()->setFormRules(); $this->getService()->setFormOptions(); //Total 서버 현황 $this->totalCounts = $this->getService()->getTotalCountsByType(); diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index e333bf5..995cc1d 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -143,7 +143,7 @@ abstract class CommonController extends BaseController //초기화 $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -153,7 +153,6 @@ abstract class CommonController extends BaseController $this->forms = ['attributes' => ['method' => "post",], 'hiddens' => []]; return $this->getResultSuccess(); } catch (\Exception $e) { - // dd($e->getMessage()); return $this->getResultFail($e->getMessage()); } } @@ -168,7 +167,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getPost()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -191,7 +190,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -221,7 +220,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getPost()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -252,7 +251,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields([$field]); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -306,7 +305,7 @@ abstract class CommonController extends BaseController $this->getService()->setAction(__FUNCTION__); list($selectedFields, $formDatas, $uids) = $this->batchjob_pre_process(); $this->getService()->setFormFields($selectedFields); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getPost()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -405,7 +404,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -430,7 +429,7 @@ abstract class CommonController extends BaseController //Filter조건절 처리 $index_filters = []; foreach ($this->getService()->getControlDatas('actionFilters') as $field) { - $value = $this->request->getGet($field); + $value = $this->getService()->getFormDatas()[$field] ?? null; if ($value) { $this->getService()->index_condition_filterField($field, $value); $index_filters[$field] = $value; @@ -490,7 +489,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); @@ -549,7 +548,7 @@ abstract class CommonController extends BaseController try { $this->getService()->setAction(__FUNCTION__); $this->getService()->setFormFields(); - //기본전달값정의 + //전달값정의 $this->getService()->setFormDatas($this->request->getGet()); $this->getService()->setFormFilters(); $this->getService()->setFormRules(); diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 18123df..b76c81a 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -342,7 +342,8 @@ class CommonHelper case 'clientinfo_uid': case 'serviceinfo_uid': case 'serverinfo_uid': - $value = array_key_exists($value, $viewDatas['control']['field_optons'][$field]) && $viewDatas['control']['field_optons'][$field][$value] ? $viewDatas['control']['field_optons'][$field][$value]->getTitle() : ""; + $value = array_key_exists($value, $viewDatas['control']['field_optons'][$field]) && + $viewDatas['control']['field_optons'][$field][$value] ? $viewDatas['control']['field_optons'][$field][$value]->getTitle() : ""; break; default: if (in_array($field, $viewDatas['control']['actionFilters'])) { diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index 5bd3ab9..65fed65 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -27,12 +27,12 @@ abstract class CommonService } return $this->_helper; } - final public function getControlDatas(?string $key = null): mixed + final public function getControlDatas(?string $key = null): string|array { if (!$key) { return $this->_control; } - return array_key_exists($key, $this->_control) ? $this->_control[$key] : null; + return array_key_exists($key, $this->_control) ? $this->_control[$key] : []; } final public function setControlDatas(string $key, mixed $values): void { diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index 300b749..092a9f9 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -69,6 +69,7 @@ class ServiceService extends CustomerService 'type', 'clientinfo_uid', 'serverinfo_uid', + 'user_uid', //home의 최신신규서버현황에서 사용 'status', ]; } diff --git a/app/Services/Equipment/ServerPartService.php b/app/Services/Equipment/ServerPartService.php index 6d5d3ee..bcc9158 100644 --- a/app/Services/Equipment/ServerPartService.php +++ b/app/Services/Equipment/ServerPartService.php @@ -122,34 +122,29 @@ class ServerPartService extends EquipmentService { switch ($field) { case 'part_uid': - $options = $this->getPartService()->getEntities(); - break; - case 'CPU': - $options = $this->getPartService()->getEntities(['type' => 'CPU']); - break; - case 'RAM': - $options = $this->getPartService()->getEntities(['type' => 'RAM']); - break; - case 'DISK': - $options = $this->getPartService()->getEntities(['type' => 'DISK']); - break; - case 'OS': - $options = $this->getPartService()->getEntities(['type' => 'OS']); - break; - case 'DB': - $options = $this->getPartService()->getEntities(['type' => 'DB']); - break; - case 'SOFTWARE': - $options = $this->getPartService()->getEntities(['type' => 'SOFTWARE']); - break; - case 'SWITCH': - $options = $this->getSwitchService()->getEntities(); - break; - case 'IP': - $options = $this->getIPService()->getEntities(); - break; - case 'CS': - $options = $this->getCSService()->getEntities(); + $type = $this->getFormDatas()['type'] ?? null; + switch ($type) { + case 'CPU': + case 'RAM': + case 'DISK': + case 'OS': + case 'DB': + case 'SOFTWARE': + $options = $this->getPartService()->getEntities(['type' => $type]); + break; + case 'SWITCH': + $options = $this->getSwitchService()->getEntities(); + break; + case 'IP': + $options = $this->getIPService()->getEntities(); + break; + case 'CS': + $options = $this->getCSService()->getEntities(); + break; + default: + $options = []; + break; + } break; default: $options = parent::getFormOption($field, $options); diff --git a/app/Views/admin/welcome/index.php b/app/Views/admin/welcome/index.php index f33a4c8..038f800 100644 --- a/app/Views/admin/welcome/index.php +++ b/app/Views/admin/welcome/index.php @@ -13,14 +13,13 @@ include("{$viewDatas['layout']}/welcome/banner"); ?> -
-
- include("{$viewDatas['layout']}/welcome/total"); ?> +
+
+ include("{$viewDatas['layout']}/welcome/total_service"); ?> + include("{$viewDatas['layout']}/welcome/new_service"); ?>
-
-
-
- include("{$viewDatas['layout']}/welcome/new"); ?> +
+ include("{$viewDatas['layout']}/welcome/user_history"); ?>
diff --git a/app/Views/admin/welcome/new.php b/app/Views/admin/welcome/new_service.php similarity index 71% rename from app/Views/admin/welcome/new.php rename to app/Views/admin/welcome/new_service.php index 6f340f4..daafdbc 100644 --- a/app/Views/admin/welcome/new.php +++ b/app/Views/admin/welcome/new_service.php @@ -1,8 +1,8 @@ -
+
@@ -15,11 +15,8 @@ 업체명 구분 장비번호 - 스위치정보 - IP정보 - CS정보 + 스위치정보 / IP정보 / CS정보 등록자 - 비고 @@ -30,11 +27,8 @@ getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?> getHelper()->getFieldView('type', $entity->getType(), $viewDatas) ?> getHelper()->getFieldView('serveripinfo_uid', $entity->getServerEntity()->getCode(), $viewDatas) ?> - getHelper()->getFieldView('SWITCH', null, $viewDatas) ?> - getHelper()->getFieldView('IP', null, $viewDatas) ?> - getHelper()->getFieldView('CS', null, $viewDatas) ?> + $entity->getServerEntity()->getPK(), 'types' => SERVERPART['SERVICE_PARTTYPES'], 'template' => 'part_service']) ?> getHelper()->getFieldView('user_uid', $entity->getUserUID(), $viewDatas) ?> - getHelper()->getFieldView('history', "", $viewDatas) ?> diff --git a/app/Views/admin/welcome/total.php b/app/Views/admin/welcome/total_service.php similarity index 96% rename from app/Views/admin/welcome/total.php rename to app/Views/admin/welcome/total_service.php index 8f72d79..c5c1a0b 100644 --- a/app/Views/admin/welcome/total.php +++ b/app/Views/admin/welcome/total_service.php @@ -2,7 +2,7 @@ diff --git a/app/Views/admin/welcome/user_history.php b/app/Views/admin/welcome/user_history.php new file mode 100644 index 0000000..34b3cf0 --- /dev/null +++ b/app/Views/admin/welcome/user_history.php @@ -0,0 +1,13 @@ +
+ +
+
+ 준비중.... +
+ \ No newline at end of file