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/issueAdd.controller.js | 124 ++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 82 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js index a15726b..12cfe73 100644 --- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAdd.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, // �뙆�씪 泥⑤� infiniteAddForm : infiniteAddForm, // 怨꾩냽 �깮�꽦 @@ -42,9 +42,9 @@ title : "", // �젣紐� description : "", // �궡�슜 projects : [], // �봽濡쒖젥�듃 - companyFields : [], // �뾽泥댁젙蹂� - ispFields : [], // ISP �젙蹂� - hostingFields : [], // �샇�뒪�똿�젙蹂� + issueCompanyFields : [], // �뾽泥댁젙蹂� + issueIspFields : [], // ISP �젙蹂� + issueHostingFields : [], // �샇�뒪�똿�젙蹂� issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒 priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒 severityId : "", // 以묒슂�룄 �븘�씠�뵒 @@ -61,7 +61,6 @@ userName : "", // �궗�슜�옄 寃��깋 departmentName : "", // 遺��꽌紐� 寃��깋 companyName : "", // �뾽泥대챸 寃��깋 - companyCode : "", // �뾽泥� 肄붾뱶 companyManager : "", // �뾽泥� �떞�떦�옄 companyTel : "", // �뾽泥� �쟾�솕踰덊샇 companyEmail : "", // �뾽泥� �씠硫붿씪 @@ -311,7 +310,7 @@ } // �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃 - function getCompanyFieldListCallBack(result) { + function getIssueCompanyFieldListCallBack(result) { $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage; } @@ -321,12 +320,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; } @@ -340,6 +339,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; @@ -349,6 +349,7 @@ // ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set) $scope.$on("ispFieldEvent", function (event, result) { + $scope.vm.ispId = result[0].id; $scope.vm.ispCode = result[0].code; $scope.vm.ispManager = result[0].manager; $scope.vm.ispTel = result[0].tel; @@ -358,6 +359,7 @@ // �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set) $scope.$on("hostingFieldEvent", function (event, result) { + $scope.vm.hostingId = result[0].id; $scope.vm.hostingCode = result[0].code; $scope.vm.hostingManager = result[0].manager; $scope.vm.hostingTel = result[0].tel; @@ -384,26 +386,26 @@ issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒 priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒 severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒 - companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒 + 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; })(), - ispId : (function () { + ispId : (function () { // ISP �븘�씠�뵒 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; })(), - hostingId : (function () { + hostingId : (function () { // Hosting �븘�씠�뵒 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; })(), @@ -443,76 +445,34 @@ startCompleteDateRange : $scope.vm.form.startCompleteDateRange, detectingDateRange : $scope.vm.form.detectingDateRange, - companyFields : (function () { - var companyFields = []; + issueCompanyFields : (function () { + var issueCompanyFields = []; - angular.forEach($scope.vm.form.companyFields, function (companyField) { - var useValues = []; + var companyField = $scope.vm.form.issueCompanyFields[0]; + companyField.companyId = companyField.id; + companyField.id = null; + issueCompanyFields.push(companyField); - 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 = []; - - 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; + var ispField = $scope.vm.form.issueIspFields[0]; + ispField.ispId = ispField.id; + ispField.id = null; + issueIspFields.push(ispField); + return issueIspFields; })(), + issueHostingFields : (function () { + var issueHostingFields = []; - 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; + var hostingField = $scope.vm.form.issueHostingFields[0]; + hostingField.hostingId = hostingField.id; + hostingField.id = null; + issueHostingFields.push(hostingField); + return issueHostingFields; })(), issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶 -- Gitblit v1.8.0