From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/main.js | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index c26e97e..9c4f188 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -227,10 +227,12 @@
'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller', // �궗�슜�옄 愿�由� 而⑦듃濡ㅻ윭
'workspaceLevelAddController' : 'app/workspace/workspaceLevelAdd.controller', // �궗�슜�옄 �벑湲� 異붽� 而⑦듃濡ㅻ윭
'levelModifyController' : 'app/workspace/levelModify.controller', // �궗�슜�옄 �벑湲� �닔�젙 而⑦듃濡ㅻ윭
+ 'departmentModifyController' : 'app/workspace/departmentModify.controller', // 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
'workspaceDepartmentAddController' : 'app/workspace/workspaceDepartmentAdd.controller', // 遺��꽌 異붽� 而⑦듃濡ㅻ윭
'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller', // �궗�슜�옄 遺��꽌 愿�由� 而⑦듃濡ㅻ윭
'workspaceService' : 'components/workspace/workspace.service', // �뾽臾� 怨듦컙�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
'paymentService' : 'components/payment/payment.service', // 寃곗옱�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
+ 'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller', // �궗�슜�옄 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
/* �궗�슜�옄 */
'userRoute' : 'app/user/user', // �궗�슜�옄�뿉 愿��젴�맂 route �젙蹂�
@@ -326,6 +328,27 @@
'apiAuthController' :'app/api/apiAuth.controller', // api �씤利� 而⑦듃濡ㅻ윭
'apiSettingController' : 'app/api/apiSetting.controller', // api �꽕�젙 而⑦듃濡ㅻ윭
'apiMonitorController' : 'app/api/apiMonitor.controller', // api 紐⑤땲�꽣留� 而⑦듃濡ㅻ윭
+
+ /* �뾽泥� */
+ 'companyFieldRoute' : 'app/companyField/companyField', // �뾽泥� route �젙蹂�
+ 'companyFieldService' : 'components/companyField/companyField.service', // �뾽泥� 愿��젴�맂 �넻�떊 �떞�떦
+ 'companyFieldListController' : 'app/companyField/companyFieldList.controller', // �뾽泥� 紐⑸줉 而⑦듃濡ㅻ윭
+ 'companyFieldAddController' : 'app/companyField/companyFieldAdd.controller', // �뾽泥� �깮�꽦 而⑦듃濡ㅻ윭
+ 'companyFieldModifyController' : 'app/companyField/companyFieldModify.controller', // �뾽泥� �닔�젙 而⑦듃濡ㅻ윭
+
+ /* ISP */
+ 'ispFieldRoute' : 'app/ispField/ispField', // ISP route �젙蹂�
+ 'ispFieldService' : 'components/ispField/ispField.service', // ISP 愿��젴�맂 �넻�떊 �떞�떦
+ 'ispFieldListController' : 'app/ispField/ispFieldList.controller', // ISP 紐⑸줉 而⑦듃濡ㅻ윭
+ 'ispFieldAddController' : 'app/ispField/ispFieldAdd.controller', // ISP �깮�꽦 而⑦듃濡ㅻ윭
+ 'ispFieldModifyController' : 'app/ispField/ispFieldModify.controller', // ISP �닔�젙 而⑦듃濡ㅻ윭
+
+ /* �샇�뒪�똿 */
+ 'hostingFieldRoute' : 'app/hostingField/hostingField', // �샇�뒪�똿 route �젙蹂�
+ 'hostingFieldService' : 'components/HostingField/hostingField.service', // �샇�뒪�똿 愿��젴�맂 �넻�떊 �떞�떦
+ 'hostingFieldListController' : 'app/hostingField/hostingFieldList.controller', // �샇�뒪�똿 紐⑸줉 而⑦듃濡ㅻ윭
+ 'hostingFieldAddController' : 'app/hostingField/hostingFieldAdd.controller', // �샇�뒪�똿 �깮�꽦 而⑦듃濡ㅻ윭
+ 'hostingFieldModifyController' : 'app/hostingField/hostingFieldModify.controller', // �샇�뒪�똿 �닔�젙 而⑦듃濡ㅻ윭
},
shim : {
'jquery-ui' : {
@@ -513,6 +536,9 @@
'supportRoute',
'ganttRoute',
'apiRoute',
+ 'companyFieldRoute',
+ 'ispFieldRoute',
+ 'hostingFieldRoute',
'ganttService',
'workflowService',
'issueSearchService',
@@ -524,8 +550,10 @@
'qnaService',
'taskService',
'taskCommentService',
- 'workflowStatusService'
-
+ 'workflowStatusService',
+ 'companyFieldService',
+ 'ispFieldService',
+ 'hostingFieldService'
], function ($, angular, domReady, app, sortable, crypto) {
// ���떆蹂대뱶�뿉�꽌 Sortable �씤�떇 紐삵븯�뒗 臾몄젣 �빐寃�
window.Sortable = sortable;
--
Gitblit v1.8.0