From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 15 2월 2022 10:40:00 +0900 Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정 --- src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 199 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 137 insertions(+), 62 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js index 0076976..131dfbb 100644 --- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js @@ -8,14 +8,15 @@ 'angular' ], function (app, angular) { - app.controller('issueAddDownTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter', 'parameter', - function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter, parameter) { + app.controller('issueAddDownTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'Issue', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter', + function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, Issue, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) { // �븿�닔 紐⑥쓬 $scope.fn = { cancel : cancel, // �뙘�뾽 李� �떕湲� formSubmit : formSubmit, // �뤌 �쟾�넚 formCheck : formCheck, // �뤌 泥댄겕 + getUsePartner : getUsePartner, getCustomFields : getCustomFields, // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 媛��졇�삩�떎. getDownIssueTableConfigs : getDownIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. }; @@ -24,42 +25,61 @@ $scope.vm = { issueId : "", issueDownTableConfigs : [{ - name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞 - key : "PRIORITY", + name : $filter("translate")("issue.downIssueTitle"), // �븯�쐞 �씠�뒋 �젣紐� + key : "DOWN_ISSUE_TITLE", width : "width-80-p", + position : 0, + display : true, + checkboxShow : false + }, { + name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭 + key : "ISSUE_DOWN_STATUS_TYPE", + width : "width-50-p", position : 1, - display : false + display : false, + checkboxShow : true + }, { + name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞 + key : "DOWN_PRIORITY", + width : "width-50-p", + position : 2, + display : false, + checkboxShow : true }, { name : $filter("translate")("common.importance"), // 以묒슂�룄 - key : "SEVERITY", - width : "width-80-p", - position : 2, - display : false + key : "DOWN_SEVERITY", + width : "width-50-p", + position : 3, + display : false, + checkboxShow : true }, { name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌 - key : "ASSIGNEE_TEAM", - width : "width-100-p", - position : 3, - display : false + key : "DOWN_ASSIGNEE_TEAM", + width : "width-50-p", + position : 4, + display : false, + checkboxShow : true }, { name : $filter("translate")("common.register"), // �벑濡앹옄 - key : "REGISTER", - width : "width-100-p", - position : 4, - display : false + key : "DOWN_REGISTER", + width : "width-50-p", + position : 5, + display : false, + checkboxShow : true }, { name : $filter("translate")("common.period"), // 湲곌컙 - key : "PERIOD", - width : "width-140-p", - position : 5, - display : false - }, { - name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪 - key : "MODIFY_DATE", + key : "DOWN_PERIOD", width : "width-100-p", position : 6, - display : false + display : false, + checkboxShow : true }, { + name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪 + key : "DOWN_MODIFY_DATE", + width : "width-100-p", + position : 7, + display : false, + checkboxShow : true }] }; @@ -78,7 +98,15 @@ $rootScope.spinner = true; var content = { - issueTypeId : parameter.issueTypeId, + issueTypeId : (function () { + var id = ""; + if ($rootScope.allIssueList) { + id = -1; + } else { + id = $rootScope.getCurrentIssueTypeId(); + } + return id; + })(), issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs) }; @@ -87,18 +115,33 @@ if (result.data.message.status === "success") { SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎." - swal.close(); + //swal.close(); $scope.fn.cancel(); // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎. $rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId}); - } else { SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣 } - - $rootScope.spinner = false; }); + } + + // �씠�뒋�쑀�삎 蹂� �뙆�듃�꼫 紐⑸줉 + function getUsePartner() { + var deferred = $q.defer(); + $scope.vm.partners = []; + + Issue.findPartners($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()}, + $resourceProvider.getPageContent(0, 1))).then(function (result) { + if (result.data.message.status === "success") { + $scope.vm.partnerVos = result.data.data; + } + else { + SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // �뙆�듃�꼫 紐⑸줉 議고쉶 �떎�뙣 + } + deferred.resolve(result.data.data); + }); + return deferred.promise; } @@ -113,7 +156,7 @@ function getCustomFields() { var deferred = $q.defer(); - CustomField.find($resourceProvider.getContent({}, + IssueTypeCustomField.findByIssueType($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()}, $resourceProvider.getPageContent(0, 1000))).then(function (result) { if (result.data.message.status !== "success") { SweetAlert.error($filter("translate")("issue.failedToUserDefinedFieldListLookup"), result.data.message.message); // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣 @@ -131,7 +174,16 @@ var content = { issueId : $rootScope.currentDetailIssueId, - delValue : $scope.vm.issueDownTableConfigs.splice(6,1), + //delValue : $scope.vm.issueDownTableConfigs.splice(8,1), + issueTypeId : (function () { + var id = ""; + if ($rootScope.allIssueList) { + id = -1; + } else { + id = $rootScope.getCurrentIssueTypeId(); + } + return id; + })(), issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs) }; @@ -147,46 +199,69 @@ return deferred.promise; } - // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. - $scope.fn.getCustomFields().then(function (result) { - var count = 6; - angular.forEach(result, function (customField) { + // �뙆�듃�꼫瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. + $scope.fn.getUsePartner().then(function (result) { + var count = 8; + angular.forEach(result, function (partner) { $scope.vm.issueDownTableConfigs.push({ - name : customField.name, - key : "CUSTOM_FIELD_" + customField.id, + name : partner.name, + key : (function () { + var key = ""; + if (partner.name === "�뾽泥�") { + key = "DOWN_COMPANY"; + } else if(partner.name === "ISP") { + key = "DOWN_ISP"; + } else { + key = "DOWN_HOSTING"; + } + return key; + })(), width : "width-100-p", display : false, + checkboxShow : true, position : count }); - count++; }); - - // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. - $scope.fn.getDownIssueTableConfigs().then(function (issueTableConfigs) { - if ($rootScope.isDefined(issueTableConfigs)) { - $rootScope.spinner = true; - - var saveTableConfigs = JSON.parse(issueTableConfigs); - - angular.forEach(saveTableConfigs, function (saveTableConfig) { - - for (var count in $scope.vm.issueDownTableConfigs) { - var issueTableConfig = $scope.vm.issueDownTableConfigs[count]; - - if (issueTableConfig.key === saveTableConfig.key) { - issueTableConfig.display = saveTableConfig.display; - issueTableConfig.width = saveTableConfig.width; - issueTableConfig.position = saveTableConfig.position; - break; - } - } + // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. + $scope.fn.getCustomFields().then(function (result) { + angular.forEach(result, function (customField) { + $scope.vm.issueDownTableConfigs.push({ + name : customField.name, + key : "CUSTOM_FIELD_" + customField.id, + width : "width-100-p", + display : false, + checkboxShow : true, + position : count }); + count++; + }); - $rootScope.spinner = false; - } + // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. + $scope.fn.getDownIssueTableConfigs().then(function (issueTableConfigs) { + if ($rootScope.isDefined(issueTableConfigs)) { + $rootScope.spinner = true; + + var saveTableConfigs = JSON.parse(issueTableConfigs); + + angular.forEach(saveTableConfigs, function (saveTableConfig) { + + for (var count in $scope.vm.issueDownTableConfigs) { + var issueTableConfig = $scope.vm.issueDownTableConfigs[count]; + + if (issueTableConfig.key === saveTableConfig.key) { + issueTableConfig.display = saveTableConfig.display; + issueTableConfig.width = saveTableConfig.width; + issueTableConfig.position = parseInt(saveTableConfig.position); + break; + } + } + }); + + $rootScope.spinner = false; + } + }); }); }); - }]); }); -- Gitblit v1.8.0