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 | 124 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 119 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js index d6eb016..a15726b 100644 --- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js @@ -16,7 +16,7 @@ $scope.fn = { cancel : cancel, // �뙘�뾽 李� �떕湲� formSubmit : formSubmit, // �뤌 �쟾�넚 - formCheck : formCheck, // �뤌 泥댄겕 + formCheck : formCheck, // �뤌 泥댄겕 getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏� getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏� getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏� @@ -61,11 +61,13 @@ userName : "", // �궗�슜�옄 寃��깋 departmentName : "", // 遺��꽌紐� 寃��깋 companyName : "", // �뾽泥대챸 寃��깋 + companyCode : "", // �뾽泥� 肄붾뱶 companyManager : "", // �뾽泥� �떞�떦�옄 companyTel : "", // �뾽泥� �쟾�솕踰덊샇 companyEmail : "", // �뾽泥� �씠硫붿씪 companyMemo : "", // �뾽泥� 鍮꾧퀬 ispName : "", // ISP 紐� + ispCode : "", // ISP 肄붾뱶 ispManager : "", // ISP �떞�떦�옄 ispTel : "", // ISP �쟾�솕踰덊샇 ispEmail : "", // ISP �씠硫붿씪 @@ -307,22 +309,25 @@ function getProjectListCallBack(result) { $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage; } + // �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃 function getCompanyFieldListCallBack(result) { $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage; } + // 遺��꽌�젙蹂� 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; - } // �뤌 泥댄겕 @@ -344,19 +349,21 @@ // 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() { @@ -377,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 = []; @@ -386,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 = []; @@ -397,8 +439,81 @@ 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 = []; @@ -424,7 +539,6 @@ return issueCustomFields; })() }; - Issue.add({ method : "POST", -- Gitblit v1.8.0