From 399177ba3859deaa6d3efa7762c5324747df3f25 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 18 11월 2021 15:48:54 +0900
Subject: [PATCH] 이슈관리 상세보기 백엔드 수정
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 141 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 010d31e..5ed22af 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -19,10 +19,10 @@
formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
- getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
+ getIssueCompanyFieldListCallBack : getIssueCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
getIssueDepartmentListCallBack : getIssueDepartmentListCallBack, // �떞�떦�옄 -> �떞�떦遺��꽌 autocomplete �럹�씠吏�
- getIspFieldListCallBack : getIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
- getHostingFieldListCallBack : getHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
+ getIssueIspFieldListCallBack : getIssueIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
getOptionColor : getOptionColor, // �슦�꽑�닚�쐞, 以묒슂�룄 �깋�긽�쑝濡� Select �깭洹� �쟻�슜
onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
imageUpload : imageUpload, // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
@@ -33,7 +33,7 @@
setFormByIssueTypeCustomFields : setFormByIssueTypeCustomFields, // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �엯�젰 �뤌�뿉�꽌 �궗�슜�븷 �닔 �엳寃� 媛�怨듯븳�떎.
setUseValueByIssueTypeCustomFields : setUseValueByIssueTypeCustomFields, // �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎.
detail : detail, // �씠�뒋 �젙蹂� 議고쉶
- removeManager : removeManager, // �떞�떦�옄 �궘�젣
+ // removeManager : removeManager, // �떞�떦�옄 �궘�젣
removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣
removeUploadFile : removeUploadFile, // �듅�젙 �뙆�씪�쓣 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
@@ -43,21 +43,21 @@
$scope.vm = {
search : {
id : parameter.id,
- deep : "01" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂�
+ deep : "02" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂�
},
form : {
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
- companyFields : [], // �뾽泥댁젙蹂�
- ispFields : [], // ISP �젙蹂�
- hostingFields : [], // �샇�뒪�똿�젙蹂�
+ issueCompanyFields : [], // �뾽泥댁젙蹂�
+ issueIspFields : [], // ISP �젙蹂�
+ issueHostingFields : [], // �샇�뒪�똿�젙蹂�
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
issueStatusId : "", // �씠�뒋 �긽�깭 �븘�씠�뵒
- users : [], // �떞�떦�옄
- departments : [], // �뵥�떦遺��꽌
+ // users : [], // �떞�떦�옄
+ departments : [], // �떞�떦遺��꽌
files : [], // �뾽濡쒕뱶 �뙆�씪
attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
startCompleteDateRange : "", // �떆�옉�씪 ~ 醫낅즺�씪
@@ -85,15 +85,15 @@
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
- user : {
- page : 0,
- totalPage : 0
- },
+ // user : {
+ // page : 0,
+ // totalPage : 0
+ // },
project : {
page : 0,
totalPage : 0
},
- companyField : {
+ issueCompanyField : {
page : 0,
totalPage : 0
},
@@ -122,11 +122,11 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕
+ // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦遺��꽌 珥덇린�솕
$scope.$watch("vm.form.projects", function (newValue, oldValue) {
if (angular.isDefined(newValue)) {
if (newValue.length < 1) {
- $scope.vm.form.users = [];
+ $scope.vm.form.departments = [];
$scope.vm.form.issueCustomFields = [];
}
else {
@@ -158,9 +158,9 @@
}
// �떞�떦�옄 �궘�젣
- function removeManager(index) {
- $scope.vm.form.users.splice(index, 1);
- }
+ // function removeManager(index) {
+ // $scope.vm.form.users.splice(index, 1);
+ // }
// �떞�떦遺��꽌 �궘�젣
function removeDepartment(index) {
@@ -311,8 +311,8 @@
}
// �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getCompanyFieldListCallBack(result) {
- $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
+ function getIssueCompanyFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.issueCompanyField.totalPage = result.data.page.totalPage;
}
// 遺��꽌�젙蹂� autocomplete page �뾽�뜲�씠�듃
@@ -321,12 +321,12 @@
}
// ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getIspFieldListCallBack(result) {
+ function getIssueIspFieldListCallBack(result) {
$scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
}
// �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getHostingFieldListCallBack(result) {
+ function getIssueHostingFieldListCallBack(result) {
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
@@ -345,6 +345,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
+ $scope.vm.companyId = result[0].id;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -386,15 +387,11 @@
return projectId;
})(),
- issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
- priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
- severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
- issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var companyId = "";
- if ($scope.vm.form.companyFields.length > 0) {
- companyId = $scope.vm.form.companyFields[0].id;
+ if ($scope.vm.form.issueCompanyFields.length > 0) {
+ companyId = $scope.vm.form.issueCompanyFields[0].id;
}
return companyId;
@@ -403,8 +400,8 @@
ispId : (function () {
var ispId = "";
- if ($scope.vm.form.ispFields.length > 0) {
- ispId = $scope.vm.form.ispFields[0].id;
+ if ($scope.vm.form.issueIspFields.length > 0) {
+ ispId = $scope.vm.form.issueIspFields[0].id;
}
return ispId;
@@ -412,12 +409,16 @@
hostingId : (function () {
var hostingId = "";
- if ($scope.vm.form.hostingFields.length > 0) {
- hostingId = $scope.vm.form.hostingFields[0].id;
+ if ($scope.vm.form.issueHostingFields.length > 0) {
+ hostingId = $scope.vm.form.issueHostingFields[0].id;
}
return hostingId;
})(),
+ issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
+ severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
userIds : (function () {
var userIds = [];
@@ -428,7 +429,6 @@
return userIds;
})(),
- removeFiles : $scope.vm.form.removeFiles,
departmentIds : (function () {
var departmentIds = [];
@@ -438,6 +438,7 @@
return departmentIds;
})(),
+ removeFiles : $scope.vm.form.removeFiles,
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -450,6 +451,40 @@
return attachedFileIds;
})(),
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
+
+ issueCompanyFields : (function () {
+ var issueCompanyFields = [];
+
+ var companyField = $scope.vm.form.issueCompanyFields;
+ issueCompanyFields.companyId = companyField.id;
+ //companyField.id = null;
+ issueCompanyFields.push(companyField);
+
+ return issueCompanyFields;
+ })(),
+
+ issueIspFields : (function () {
+ var issueIspFields = [];
+
+ var ispField = $scope.vm.form.issueIspFields;
+ issueIspFields.ispId = ispField.id;
+ ispField.id = null;
+ issueIspFields.push(ispField);
+
+ return issueIspFields;
+ })(),
+
+ issueHostingFields : (function () {
+ var issueHostingFields = [];
+
+ var hostingField = $scope.vm.form.issueHostingFields;
+ issueHostingFields.hostingId = hostingField.id;
+ hostingField.id = null;
+ issueHostingFields.push(hostingField);
+
+ return issueHostingFields;
+ })(),
+
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
var issueCustomFields = [];
@@ -668,17 +703,45 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.title = result.data.data.title;
$scope.vm.form.description = result.data.data.description;
+
$scope.vm.form.projects.push(result.data.data.projectVo);
- $scope.vm.form.departments.push(result.data.data.departmentVo);
$scope.vm.projectName = result.data.data.projectVo.name;
- $scope.vm.departmentName = result.data.data.departmentVo.departmentName;
+
$scope.vm.form.issueTypeId = String(result.data.data.issueTypeVo.id);
$scope.vm.form.priorityId = String(result.data.data.priorityVo.id);
$scope.vm.form.severityId = String(result.data.data.severityVo.id);
$scope.vm.form.issueStatusId = String(result.data.data.issueStatusVo.id);
- $scope.vm.form.users = result.data.data.userVos;
- $scope.vm.form.files = result.data.data.attachedFileVos;
+ $scope.vm.form.users = result.data.data.userVos;
+ $scope.vm.form.departments = result.data.data.departmentVos;
+ $scope.vm.form.files = result.data.data.attachedFileVos;
+ // issueVo �뿉 get & set �꽕�젙媛� �꽕�젙 ex)issueCompanyVos
+ $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos[0];
+ var issueCompanyFieldValue = result.data.data.issueCompanyVos[0];
+ $scope.vm.companyName = issueCompanyFieldValue.name;
+ $scope.vm.companyManager = issueCompanyFieldValue.manager;
+ $scope.vm.companyTel = issueCompanyFieldValue.tel;
+ $scope.vm.companyEmail = issueCompanyFieldValue.email;
+ $scope.vm.companyMemo = issueCompanyFieldValue.memo;
+ //
+ $scope.vm.form.issueIspFields = result.data.data.issueIspVos[0]
+ var issueIspFieldValue = result.data.data.issueIspVos[0];
+ $scope.vm.ispName = issueIspFieldValue.name;
+ $scope.vm.ispCode = issueIspFieldValue.code;
+ $scope.vm.ispManager = issueIspFieldValue.manager;
+ $scope.vm.ispTel = issueIspFieldValue.tel;
+ $scope.vm.ispEmail = issueIspFieldValue.email;
+ $scope.vm.ispMemo = issueIspFieldValue.memo;
+ //
+ $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos[0];
+ var issueHostingFieldValue = result.data.data.issueHostingVos[0];
+ $scope.vm.hostingName = issueHostingFieldValue.name;
+ $scope.vm.hostingCode = issueHostingFieldValue.code;
+ $scope.vm.hostingManager = issueHostingFieldValue.manager;
+ $scope.vm.hostingTel = issueHostingFieldValue.tel;
+ $scope.vm.hostingEmail = issueHostingFieldValue.email;
+ $scope.vm.hostingMemo = issueHostingFieldValue.memo;
+ //
if ($rootScope.isDefined(result.data.data.startDate)) {
$scope.vm.form.startCompleteDateRange = result.data.data.startDate + " ~ " + result.data.data.completeDate;
}
--
Gitblit v1.8.0