From dccda7c93a2a18571fe43c5de1c66eabefc25139 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 17 11월 2021 18:31:06 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 204 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 3345714..a15726b 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -16,10 +16,13 @@
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- // formCheck : formCheck, // �뤌 泥댄겕
+ formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
- getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
+ getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
+ getIssueDepartmentListCallBack : getIssueDepartmentListCallBack, // �떞�떦�옄 -> �떞�떦遺��꽌 autocomplete �럹�씠吏�
+ getIspFieldListCallBack : getIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
+ getHostingFieldListCallBack : getHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
getOptionColor : getOptionColor, // �슦�꽑�닚�쐞, 以묒슂�룄 �깋�긽�쑝濡� Select �깭洹� �쟻�슜
onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
infiniteAddForm : infiniteAddForm, // 怨꾩냽 �깮�꽦
@@ -31,8 +34,7 @@
removeUploadFile : removeUploadFile, // �뾽濡쒕뱶�븯�젮�뒗 �듅�젙 �뙆�씪�쓣 �궘�젣
removeManager : removeManager, // �떞�떦�옄 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
- startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- companyImport : companyImport
+ startExecute : startExecute // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
};
$scope.vm = {
@@ -40,24 +42,41 @@
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
- companyFields : [],
+ companyFields : [], // �뾽泥댁젙蹂�
+ ispFields : [], // ISP �젙蹂�
+ hostingFields : [], // �샇�뒪�똿�젙蹂�
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
users : [], // �떞�떦�옄
+ departments : [], // �뵥�떦遺��꽌
files : [], // �뾽濡쒕뱶 �뙆�씪
attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
startCompleteDateRange : "", // �떆�옉�씪 ~ 醫낅즺�씪
+ detectingDateRange : "", // �깘吏��씪
issueCustomFields : [] // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
},
infiniteAdd : false, // �뿰�냽 �깮�꽦
projectName : "", // �봽濡쒖젥�듃 紐� 寃��깋
- companyName : "", // �봽濡쒖젥�듃 紐� 寃��깋
userName : "", // �궗�슜�옄 寃��깋
- companyManager : "", //�떞�떦�옄
- companyTel : "", //�쟾�솕踰덊샇
- companyEmail : "", //�씠硫붿씪
- companyDesc : "", //鍮꾧퀬
+ departmentName : "", // 遺��꽌紐� 寃��깋
+ companyName : "", // �뾽泥대챸 寃��깋
+ companyCode : "", // �뾽泥� 肄붾뱶
+ companyManager : "", // �뾽泥� �떞�떦�옄
+ companyTel : "", // �뾽泥� �쟾�솕踰덊샇
+ companyEmail : "", // �뾽泥� �씠硫붿씪
+ companyMemo : "", // �뾽泥� 鍮꾧퀬
+ ispName : "", // ISP 紐�
+ ispCode : "", // ISP 肄붾뱶
+ ispManager : "", // ISP �떞�떦�옄
+ ispTel : "", // ISP �쟾�솕踰덊샇
+ ispEmail : "", // ISP �씠硫붿씪
+ ispMemo : "", // ISP 鍮꾧퀬
+ hostingName : "", // �샇�뒪�똿紐� 寃��깋
+ hostingManager : "", // �샇�뒪�똿 �떞�떦�옄
+ hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
+ hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+ hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
user : {
page : 0,
@@ -68,6 +87,18 @@
totalPage : 0
},
companyField : {
+ page : 0,
+ totalPage : 0
+ },
+ department : {
+ page : 0,
+ totalPage : 0
+ },
+ ispField : {
+ page : 0,
+ totalPage : 0
+ },
+ hostingField : {
page : 0,
totalPage : 0
}
@@ -83,7 +114,6 @@
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
-
function getStartProjectListCallback(result){
// �봽濡쒖젥�듃 autocomplete page �뾽�뜲�씠�듃
@@ -104,15 +134,6 @@
$scope.fn.getIssueTypeCustomFields();
}
});
-
- function companyImport() {
- $uibModal.open({
- templateUrl : 'views/issue/issueCompanyFieldDetail.html',
- size : "mg",
- controller : 'issueCompanyFieldDetailController',
- backdrop : 'static',
- });
- }
// �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
function imageUpload($files) {
@@ -267,7 +288,7 @@
// �떞�떦�옄 �궘�젣
function removeManager(index) {
- $scope.vm.form.users.splice(index, 1);
+ $scope.vm.form.departments.splice(index, 1);
}
// �뾽濡쒕뱶 �뙆�씪 �궘�젣
@@ -289,22 +310,60 @@
$scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
}
+ // �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃
function getCompanyFieldListCallBack(result) {
- $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
+ $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
}
- // �뤌 泥댄겕
- // function formCheck(formInvalid) {
- // if (formInvalid) {
- // return true;
- // }
- //
- // if ($scope.vm.form.projects.length < 1) {
- // return true;
- // }
- //
- // return false;
- // }
+ // 遺��꽌�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIssueDepartmentListCallBack(result) {
+ $scope.vm.autoCompletePage.department.totalPage = result.data.page.totalPage;
+ }
+
+ // ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIspFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
+ }
+
+ // �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getHostingFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
+ }
+
+ // �뤌 泥댄겕
+ function formCheck(formInvalid) {
+ if (formInvalid) {
+ return true;
+ }
+ return false;
+ }
+
+ // �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
+ $scope.$on("companyFieldEvent", function (event, result) {
+ $scope.vm.companyManager = result[0].manager;
+ $scope.vm.companyTel = result[0].tel;
+ $scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyMemo = result[0].memo;
+
+ });
+
+ // ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
+ $scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.ispCode = result[0].code;
+ $scope.vm.ispManager = result[0].manager;
+ $scope.vm.ispTel = result[0].tel;
+ $scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispMemo = result[0].memo;
+ });
+
+ // �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
+ $scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.hostingCode = result[0].code;
+ $scope.vm.hostingManager = result[0].manager;
+ $scope.vm.hostingTel = result[0].tel;
+ $scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingMemo = result[0].memo;
+ });
// �뤌 �쟾�넚
function formSubmit() {
@@ -325,6 +384,30 @@
issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
+ var companyId = "";
+ if ($scope.vm.form.companyFields.length > 0) {
+ companyId = $scope.vm.form.companyFields[0].id;
+ }
+ return companyId;
+ })(),
+
+ ispId : (function () {
+ var ispId = "";
+ if ($scope.vm.form.ispFields.length > 0) {
+ ispId = $scope.vm.form.ispFields[0].id;
+ }
+ return ispId;
+ })(),
+
+ hostingId : (function () {
+ var hostingId = "";
+ if ($scope.vm.form.hostingFields.length > 0) {
+ hostingId = $scope.vm.form.hostingFields[0].id;
+ }
+ return hostingId;
+ })(),
+
userIds : (function () {
var userIds = [];
@@ -334,6 +417,17 @@
return userIds;
})(),
+
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+
+ return departmentIds;
+ })(),
+
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -345,7 +439,82 @@
return attachedFileIds;
})(),
+
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
+ detectingDateRange : $scope.vm.form.detectingDateRange,
+
+ companyFields : (function () {
+ var companyFields = [];
+
+ angular.forEach($scope.vm.form.companyFields, function (companyField) {
+ var useValues = [];
+
+ if (angular.isArray(companyField.useValues)) {
+ angular.forEach(companyField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(companyField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(companyField);
+ temp.useValues = useValues;
+ companyFields.push(temp);
+ });
+
+ return companyFields;
+ })(),
+
+ ispFields : (function () {
+ var ispFields = [];
+
+ angular.forEach($scope.vm.form.ispFields, function (ispField) {
+ var useValues = [];
+
+ if (angular.isArray(ispField.useValues)) {
+ angular.forEach(ispField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(ispField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(ispField);
+ temp.useValues = useValues;
+ ispFields.push(temp);
+ });
+
+ return ispFields;
+ })(),
+
+ hostingFields : (function () {
+ var hostingFields = [];
+
+ angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
+ var useValues = [];
+
+ if (angular.isArray(hostingField.useValues)) {
+ angular.forEach(hostingField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(hostingField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(hostingField);
+ temp.useValues = useValues;
+ hostingFields.push(temp);
+ });
+
+ return hostingFields;
+ })(),
+
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
var issueCustomFields = [];
@@ -370,7 +539,6 @@
return issueCustomFields;
})()
};
-
Issue.add({
method : "POST",
@@ -566,6 +734,7 @@
// 理쒖큹 �떎�뻾
function startExecute() {
+
var promises = {
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
--
Gitblit v1.8.0