diff --git a/app/Cells/Equipment/PartCell.php b/app/Cells/Equipment/PartCell.php new file mode 100644 index 0000000..737de66 --- /dev/null +++ b/app/Cells/Equipment/PartCell.php @@ -0,0 +1,31 @@ +getService()->setAction(__FUNCTION__); + $this->getService()->setFormFields(); + $this->getService()->setFormFilters(); + $this->getService()->setFormRules(); + $this->getService()->setFormOptions(); + $types = array_key_exists('types', $params) ? $params['types'] : SERVERPART['STOCK_PARTTYPES']; + $template = array_key_exists('template', $params) ? $params['template'] : __FUNCTION__; + return view('cells/part/' . $template, [ + 'partCellDatas' => [ + 'control' => $this->getService()->getControlDatas(), + 'service' => $this->getService(), + 'entities' => $this->getService()->getEntities("type IN (" . "'" . implode("','", $types) . "'" . ")"), + ], + ]); + } +} diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 3a1bfec..1c08264 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -404,6 +404,7 @@ define("SERVICE", [ //서버파트 관련 define("SERVERPART", [ "CNT_RANGE" => array_combine(range(1, 10), range(1, 10)), + "STOCK_PARTTYPES" => ['CPU', 'RAM', 'DISK'], "SERVER_PARTTYPES" => ['CPU', 'RAM', 'DISK', 'ETC'], "SERVICE_PARTTYPES" => ['SWITCH', 'IP', 'OS', 'SOFTWARE', 'CS', 'ETC'], "ALL_PARTTYPES" => ['CPU', 'RAM', 'DISK', 'OS', 'DB', 'SOFTWARE', 'SWITCH', 'IP', 'CS', 'ETC'], diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index ae661c3..6f3d6f2 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -159,7 +159,7 @@ abstract class CommonService return $this->getEntity_process($entity); } catch (\Exception $e) { $message = sprintf( - "\n------%s SQL오류-----
\n%s
\n%s
\n------------------------------\n", + "\n------%s SQL오류-----
\n%s\n%s\n------------------------------\n", __FUNCTION__, $this->getModel()->getLastQuery(), $e->getMessage() @@ -196,7 +196,7 @@ abstract class CommonService return $entities; } catch (\Exception $e) { $message = sprintf( - "\n------%s SQL오류-----
\n%s
\n%s
\n------------------------------\n", + "\n------%s SQL오류-----
\n%s\n%s\n------------------------------\n", __FUNCTION__, $this->getModel()->getLastQuery(), $e->getMessage() diff --git a/app/Views/admin/welcome/index.php b/app/Views/admin/welcome/index.php index 68b1b85..80d94e2 100644 --- a/app/Views/admin/welcome/index.php +++ b/app/Views/admin/welcome/index.php @@ -15,11 +15,15 @@ include("{$viewDatas['layout']}/welcome/banner"); ?>
- > + include("{$viewDatas['layout']}/welcome/total_service"); ?> include("{$viewDatas['layout']}/welcome/new_service"); ?>
include("{$viewDatas['layout']}/welcome/user_history"); ?> +
+
+
+
include("{$viewDatas['layout']}/welcome/stock"); ?>
diff --git a/app/Views/admin/welcome/stock.php b/app/Views/admin/welcome/stock.php index b8fcbd9..1b7ca7e 100644 --- a/app/Views/admin/welcome/stock.php +++ b/app/Views/admin/welcome/stock.php @@ -8,6 +8,6 @@
- 준비중.... + SERVERPART['STOCK_PARTTYPES']]) ?>
\ No newline at end of file diff --git a/app/Views/admin/welcome/total_service.php b/app/Views/admin/welcome/total_service.php index 13e786d..10a7711 100644 --- a/app/Views/admin/welcome/total_service.php +++ b/app/Views/admin/welcome/total_service.php @@ -8,68 +8,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - $label): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
고객명일반방어전용대체테스트합계
도쿄치바도쿄치바도쿄치바도쿄치바도쿄치바합계도쿄치바합계
총합계00000000000000
+
\ No newline at end of file diff --git a/app/Views/cells/part/parttable.php b/app/Views/cells/part/parttable.php new file mode 100644 index 0000000..d90548f --- /dev/null +++ b/app/Views/cells/part/parttable.php @@ -0,0 +1,11 @@ + + + + + + + + + + +
getHelper()->getFieldView($field, $entity->$field, $partCellDatas) ?>
\ No newline at end of file diff --git a/app/Views/cells/service/totalCountDashboard.php b/app/Views/cells/service/totalCountDashboard.php index ced3be9..bc8e859 100644 --- a/app/Views/cells/service/totalCountDashboard.php +++ b/app/Views/cells/service/totalCountDashboard.php @@ -1,75 +1,63 @@ -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - $label): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
고객명일반방어전용대체테스트합계
도쿄치바도쿄치바도쿄치바도쿄치바도쿄치바합계도쿄치바합계
총합계00000000000000
-
- \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + $label): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
고객명일반방어전용대체테스트합계
도쿄치바도쿄치바도쿄치바도쿄치바도쿄치바합계도쿄치바합계
총합계00000000000000
\ No newline at end of file