From a9104b7bc9016b32f43f4fcbe4e3d7b29edef3b3 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 13:34:37 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 149 +++++++++++++++----------------------------------
1 files changed, 47 insertions(+), 102 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 6023a47..5bc24a4 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, // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
@@ -49,9 +49,9 @@
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
- companyFields : [], // �뾽泥댁젙蹂�
- ispFields : [], // ISP �젙蹂�
- hostingFields : [], // �샇�뒪�똿�젙蹂�
+ issueCompanyFields : [], // �뾽泥댁젙蹂�
+ issueIspFields : [], // ISP �젙蹂�
+ issueHostingFields : [], // �샇�뒪�똿�젙蹂�
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
@@ -93,7 +93,7 @@
page : 0,
totalPage : 0
},
- companyField : {
+ issueCompanyField : {
page : 0,
totalPage : 0
},
@@ -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.issuecompanyId = result[0].id;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -387,20 +388,20 @@
return projectId;
})(),
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
- var companyId = "";
+ var issueCompanyId = "";
- if ($scope.vm.form.companyFields.length > 0) {
- companyId = $scope.vm.form.companyFields[0].id;
+ if ($scope.vm.form.issueCompanyFields.length > 0) {
+ issueCompanyId = $scope.vm.form.issueCompanyFields[0].id;
}
- return companyId;
+ return issueCompanyId;
})(),
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;
@@ -408,8 +409,8 @@
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;
@@ -451,76 +452,37 @@
})(),
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
- companyFields : (function () {
- var companyFields = [];
+ issueCompanyFields : (function () {
+ var issueCompanyFields = [];
- angular.forEach($scope.vm.form.companyFields, function (companyField) {
- var useValues = [];
+ var issueCompanyField = $scope.vm.form.issueCompanyFields[0];
+ issueCompanyFields.companyId = issueCompanyField.id;
+ issueCompanyField.id = null;
+ issueCompanyFields.push(issueCompanyField);
- 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;
+ return issueCompanyFields;
})(),
- ispFields : (function () {
- var ispFields = [];
+ issueIspFields : (function () {
+ var issueIspFields = [];
- angular.forEach($scope.vm.form.ispFields, function (ispField) {
- var useValues = [];
+ var ispField = $scope.vm.form.issueIspFields[0];
+ issueIspFields.ispId = ispField.id;
+ ispField.id = null;
+ issueIspFields.push(ispField);
- 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;
+ return issueIspFields;
})(),
- hostingFields : (function () {
- var hostingFields = [];
+ issueHostingFields : (function () {
+ var issueHostingFields = [];
- angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
- var useValues = [];
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+ issueHostingFields.hostingId = hostingField.id;
+ hostingField.id = null;
+ issueHostingFields.push(hostingField);
- 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;
+ return issueHostingFields;
})(),
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
@@ -753,30 +715,13 @@
$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;
//
- $scope.vm.form.companyFields.push(result.data.data.companyFieldVo);
- $scope.vm.companyName = result.data.data.companyFieldVo.name;
- $scope.vm.companyManager = result.data.data.companyFieldVo.manager;
- $scope.vm.companyTel = result.data.data.companyFieldVo.tel;
- $scope.vm.companyEmail = result.data.data.companyFieldVo.email;
- $scope.vm.companyMemo = result.data.data.companyFieldVo.memo;
-
- $scope.vm.form.ispFields.push(result.data.data.ispFieldVo);
- $scope.vm.ispName = result.data.data.ispFieldVo.name;
- $scope.vm.ispCode = result.data.data.ispFieldVo.code;
- $scope.vm.ispManager = result.data.data.ispFieldVo.manager;
- $scope.vm.ispTel = result.data.data.ispFieldVo.tel;
- $scope.vm.ispEmail = result.data.data.ispFieldVo.email;
- $scope.vm.ispMemo = result.data.data.ispFieldVo.memo;
-
- $scope.vm.form.hostingFields.push(result.data.data.hostingFieldVo);
- $scope.vm.hostingName = result.data.data.hostingFieldVo.name;
- $scope.vm.hostingCode = result.data.data.hostingFieldVo.code;
- $scope.vm.hostingManager = result.data.data.hostingFieldVo.manager;
- $scope.vm.hostingTel = result.data.data.hostingFieldVo.tel;
- $scope.vm.hostingEmail = result.data.data.hostingFieldVo.email;
- $scope.vm.hostingMemo = result.data.data.hostingFieldVo.memo;
-
+ $scope.vm.form.issueIspFields = result.data.data.issueIspVos;
+ //
+ $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos;
+ //
if ($rootScope.isDefined(result.data.data.startDate)) {
$scope.vm.form.startCompleteDateRange = result.data.data.startDate + " ~ " + result.data.data.completeDate;
}
--
Gitblit v1.8.0