diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php
index 6fe4edd..18123df 100644
--- a/app/Helpers/CommonHelper.php
+++ b/app/Helpers/CommonHelper.php
@@ -208,9 +208,8 @@ class CommonHelper
}
// $formOptions는 필터 옵션 배열로, key는 필터 엔티티의 PK, value는 필터 엔티티 객체
$html = sprintf("';
return $html;
}
diff --git a/app/Views/admin/server/index.php b/app/Views/admin/server/index.php
index 12c3a85..c17db03 100644
--- a/app/Views/admin/server/index.php
+++ b/app/Views/admin/server/index.php
@@ -36,17 +36,23 @@
번호 |
= $viewDatas['service']->getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?>/
+ |
+
= $viewDatas['service']->getHelper()->getListLabel('serviceinfo_uid', lang("{$viewDatas['class_path']}.label.serviceinfo_uid"), $viewDatas) ?>
|
- = $viewDatas['service']->getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?>/
+ = $viewDatas['service']->getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getListLabel('title', lang("{$viewDatas['class_path']}.label.title"), $viewDatas) ?>
|
= $viewDatas['service']->getHelper()->getListLabel('price', lang("{$viewDatas['class_path']}.label.price"), $viewDatas) ?>
|
- = $viewDatas['service']->getHelper()->getListLabel('manufactur_at', lang("{$viewDatas['class_path']}.label.manufactur_at"), $viewDatas) ?>/
+ = $viewDatas['service']->getHelper()->getListLabel('manufactur_at', lang("{$viewDatas['class_path']}.label.manufactur_at"), $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getListLabel('format_at', lang("{$viewDatas['class_path']}.label.format_at"), $viewDatas) ?>
|
@@ -64,10 +70,14 @@
| = $viewDatas['service']->getHelper()->getListButton('modify', '', $viewDatas) ?> |
= $viewDatas['service']->getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getFieldView('serviceinfo_uid', $entity->getServiceInfoUID(), $viewDatas) ?>
|
= $viewDatas['service']->getHelper()->getFieldView('type', $entity->type, $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getFieldView('title', $entity->getTitle(), $viewDatas) ?>
|
@@ -75,6 +85,8 @@
|
= $viewDatas['service']->getHelper()->getFieldView('manufactur_at', $entity->manufactur_at, $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getFieldView('format_at', $entity->format_at, $viewDatas) ?>
|
= $viewDatas['service']->getHelper()->getFieldView('status', $entity->status, $viewDatas) ?> |
diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php
index 8a0a21e..a8bc69b 100644
--- a/app/Views/admin/service/index.php
+++ b/app/Views/admin/service/index.php
@@ -35,20 +35,32 @@
| 번호 |
- = $viewDatas['service']->getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getListLabel('start_at', lang("{$viewDatas['class_path']}.label.start_at"), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getListLabel('site', lang("{$viewDatas['class_path']}.label.site"), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getListLabel('location', lang("{$viewDatas['class_path']}.label.location"), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?> /
+ = $viewDatas['service']->getHelper()->getListLabel('site', lang("{$viewDatas['class_path']}.label.site"), $viewDatas) ?>
+ |
+
+ = $viewDatas['service']->getHelper()->getListLabel('location', lang("{$viewDatas['class_path']}.label.location"), $viewDatas) ?>
+ |
+
+ = $viewDatas['service']->getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?>
+ |
+
+ = $viewDatas['service']->getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?>
|
= $viewDatas['service']->getHelper()->getListLabel('serverinfo_uid', lang("{$viewDatas['class_path']}.label.serverinfo_uid"), $viewDatas) ?>/SWITCH/IP/OS
|
- = $viewDatas['service']->getHelper()->getListLabel('amount', lang("{$viewDatas['class_path']}.label.amount"), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getListLabel('billing_at', lang("{$viewDatas['class_path']}.label.billing_at"), $viewDatas) ?> /
+ = $viewDatas['service']->getHelper()->getListLabel('amount', lang("{$viewDatas['class_path']}.label.amount"), $viewDatas) ?>
+ |
+
+ = $viewDatas['service']->getHelper()->getListLabel('billing_at', lang("{$viewDatas['class_path']}.label.billing_at"), $viewDatas) ?>
+ |
+
= $viewDatas['service']->getHelper()->getListLabel('status', lang("{$viewDatas['class_path']}.label.status"), $viewDatas) ?>
|
+
+ = $viewDatas['service']->getHelper()->getListLabel('start_at', lang("{$viewDatas['class_path']}.label.start_at"), $viewDatas) ?>
+ |
작업 |
@@ -59,24 +71,18 @@
getStatus() === $entity::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>>
| = $viewDatas['service']->getHelper()->getListButton('modify', $viewDatas['cnt'], $viewDatas) ?> |
-
-
- = $viewDatas['service']->getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getFieldView('start_at', $entity->start_at, $viewDatas) ?>
-
- = $viewDatas['service']->getHelper()->getFieldView('site', $entity->site, $viewDatas) ?>
- = $viewDatas['service']->getHelper()->getFieldView('location', $entity->location, $viewDatas) ?>
- = $viewDatas['service']->getHelper()->getFieldView('type', $entity->type, $viewDatas) ?>
- |
+ = $viewDatas['service']->getHelper()->getFieldView('site', $entity->site, $viewDatas) ?>
+ | = $viewDatas['service']->getHelper()->getFieldView('location', $entity->location, $viewDatas) ?>
+ | = $viewDatas['service']->getHelper()->getFieldView('type', $entity->type, $viewDatas) ?> |
+ = $viewDatas['service']->getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?> |
= $viewDatas['service']->getHelper()->getFieldView('serverinfo_uid', $entity->getServerEntity()->getTitle() ?? "", $viewDatas) ?> /
= view_cell("\App\Cells\Equipment\ServerPartCell::parttable", ['serverinfo_uid' => $entity->getServerEntity()->getPK(), 'types' => SERVERPART['SERVICE_PARTTYPES'], 'template' => 'partservice']) ?>
|
-
- = $viewDatas['service']->getHelper()->getFieldView('amount', $entity->amount, $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getFieldView('billing_at', $entity->billing_at, $viewDatas) ?> /
- = $viewDatas['service']->getHelper()->getFieldView('status', $entity->status, $viewDatas) ?>
- |
+ = $viewDatas['service']->getHelper()->getFieldView('amount', $entity->amount, $viewDatas) ?> |
+ = $viewDatas['service']->getHelper()->getFieldView('billing_at', $entity->billing_at, $viewDatas) ?> |
+ = $viewDatas['service']->getHelper()->getFieldView('status', $entity->status, $viewDatas) ?> |
+ = $viewDatas['service']->getHelper()->getFieldView('start_at', $entity->start_at, $viewDatas) ?> |
= $viewDatas['service']->getHelper()->getListButton('view', '', $viewDatas) ?>
|