From 8ecffbb61c5505475cd0738032abda5efe2a1812 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 21:36:32 +0900
Subject: [PATCH] 이슈 수정 완료
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 201 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 131 insertions(+), 70 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 5ed22af..deda875 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -67,18 +67,21 @@
projectName : "", // �봽濡쒖젥�듃 紐� 寃��깋
userName : "", // �궗�슜�옄 寃��깋
departmentName : "", // 遺��꽌紐� 寃��깋
+ companyId : -1,
companyName : "", // �뾽泥대챸 寃��깋
companyCode : "", // �뾽泥� 肄붾뱶
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
companyMemo : "", // �뾽泥� 鍮꾧퀬
+ ispId : -1,
ispName : "", // ISP 紐�
ispCode : "", // ISP 肄붾뱶
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
ispMemo : "", // ISP 鍮꾧퀬
+ hostingId : -1,
hostingName : "", // �샇�뒪�똿紐� 寃��깋
hostingManager : "", // �샇�뒪�똿 �떞�떦�옄
hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
@@ -346,6 +349,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
$scope.vm.companyId = result[0].id;
+ $scope.vm.companyName = result[0].name;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -355,6 +359,8 @@
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.ispId = result[0].id;
+ $scope.vm.ispName = result[0].name;
$scope.vm.ispCode = result[0].code;
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
@@ -364,6 +370,8 @@
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.hostingId = result[0].id;
+ $scope.vm.hostingName = result[0].name;
$scope.vm.hostingCode = result[0].code;
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
@@ -387,38 +395,116 @@
return projectId;
})(),
- companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
- var companyId = "";
+
+ issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
+ severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
+
+ companyId : (function () {
+ var companyId = -1;
if ($scope.vm.form.issueCompanyFields.length > 0) {
companyId = $scope.vm.form.issueCompanyFields[0].id;
}
return companyId;
- })(),
+ }),
ispId : (function () {
- var ispId = "";
+ var ispId = -1;
if ($scope.vm.form.issueIspFields.length > 0) {
ispId = $scope.vm.form.issueIspFields[0].id;
}
return ispId;
- })(),
+ }),
+
hostingId : (function () {
- var hostingId = "";
+ var hostingId = -1;
if ($scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
}
return hostingId;
+ }),
+
+ issueCompanyFields : (function () {
+ var issueCompanyFields = [];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
+ var companyField = $scope.vm.form.issueCompanyFields[0];
+
+ issueCompanyFields.push({
+ id : companyField.id,
+ companyId : $scope.vm.companyId,
+ name : $scope.vm.companyName,
+ manager : $scope.vm.companyManager,
+ tel : $scope.vm.companyTel,
+ email :$scope.vm.companyEmail,
+ memo : $scope.vm.companyMemo
+ });
+ }
+
+ return issueCompanyFields;
})(),
- issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
- priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
- severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
- issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
+
+ issueIspFields : (function () {
+ var issueIspFields = [];
+ if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
+ var ispField = $scope.vm.form.issueIspFields[0];
+
+ issueIspFields.push({
+ id : ispField.id,
+ ispId : $scope.vm.ispId,
+ code : $scope.vm.ispCode,
+ name : $scope.vm.ispName,
+ manager : $scope.vm.ispManager,
+ tel : $scope.vm.ispTel,
+ email :$scope.vm.ispEmail,
+ memo : $scope.vm.ispMemo
+ });
+
+ }
+
+ return issueIspFields;
+ })(),
+
+ issueHostingFields : (function () {
+ var issueHostingFields = [];
+ if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
+
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+
+ issueHostingFields.push({
+ id : hostingField.id,
+ hostingId : $scope.vm.hostingId,
+ name : $scope.vm.hostingName,
+ code : $scope.vm.hostingCode,
+ manager : $scope.vm.hostingManager,
+ tel : $scope.vm.hostingTel,
+ email :$scope.vm.hostingEmail,
+ memo : $scope.vm.hostingMemo
+ });
+ }
+
+ return issueHostingFields;
+ })(),
+
+ ispName : $scope.vm.ispName,
+ ispCode : $scope.vm.ispCode,
+ ispManager : $scope.vm.ispManager,
+ ispTel : $scope.vm.ispTel,
+ ispEmail : $scope.vm.ispEmail,
+ ispMemo : $scope.vm.ispMemo,
+
+ hostingName : $scope.vm.hostingName,
+ hostingCode : $scope.vm.hostingCode,
+ hostingManager : $scope.vm.hostingManager,
+ hostingTel : $scope.vm.hostingTel,
+ hostingEmail : $scope.vm.hostingEmail,
+ hostingMemo : $scope.vm.hostingMemo,
userIds : (function () {
var userIds = [];
@@ -451,39 +537,6 @@
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 = [];
@@ -715,33 +768,41 @@
$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 (result.data.data.issueCompanyVos != null && result.data.data.issueCompanyVos.length > 0) {
+ $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos;
+ var issueCompanyFieldValue = result.data.data.issueCompanyVos[0];
+ $scope.vm.companyId = issueCompanyFieldValue.id;
+ $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;
+ }
+ if (result.data.data.issueIspVos != null && result.data.data.issueIspVos.length > 0) {
+ $scope.vm.form.issueIspFields = result.data.data.issueIspVos;
+ var issueIspFieldValue = result.data.data.issueIspVos[0];
+ $scope.vm.ispId = issueIspFieldValue.id;
+ $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;
+ }
+
+ if (result.data.data.issueHostingVos != null && result.data.data.issueHostingVos.length > 0) {
+ $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos;
+ var issueHostingFieldValue = result.data.data.issueHostingVos[0];
+ $scope.vm.hostingId = issueHostingFieldValue.id;
+ $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