From f76592e90c1a2810b65b5a93fadf2c19c13b6bc4 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 17 12월 2021 18:23:21 +0900 Subject: [PATCH] 상위이슈의 상세페이지에서 하위이슈에 대한 활동내역 보여주기 완료 --- src/main/webapp/scripts/app/api/apiSetting.controller.js | 184 ++++++++++++++++++++++++++++++++------------- 1 files changed, 130 insertions(+), 54 deletions(-) diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js index 8b88ca9..acb070f 100644 --- a/src/main/webapp/scripts/app/api/apiSetting.controller.js +++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js @@ -23,7 +23,7 @@ initForm : initForm, getPriorities : getPriorities, getSeverities : getSeverities, - start : start, + onChangeColumnSetting : onChangeColumnSetting, getIssueTypes : getIssueTypes, onChangeIssueType : onChangeIssueType, reset : reset, @@ -34,19 +34,22 @@ onChangeIssueTypeOverlap : onChangeIssueTypeOverlap, getIssueTypeCustomFields : getIssueTypeCustomFields, getCurrentIssueTypeVo : getCurrentIssueTypeVo, - loadSpec : loadSpec, getIssueStatuses : getIssueStatuses, onChangeIssueTypeSpec : onChangeIssueTypeSpec, createRequestModifyJson : createRequestModifyJson, createRequestAddJson : createRequestAddJson, createCustomFields : createCustomFields, - getProjectList : getProjectList + getProjects : getProjects, + formSubmitCompleteIssueStatus : formSubmitCompleteIssueStatus, + loadPage : loadPage, + resetCompleteIssueStatus : resetCompleteIssueStatus }; $scope.vm = { - tab : "API_COL_SETTING", + tab : "", issueTypes : [], issueStatuses : [], + completeIssueStatuses : [], severities : [], priorities : [], projects : [], @@ -76,6 +79,7 @@ // totalPage : 0 // } }, + completeIssueStatusId : "", issueTypeId : "", issueTypeName : "", @@ -87,6 +91,8 @@ projectId : "", projectName : "", }; + + angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); function initForm() { $scope.vm.form.issueApiDefault.title = ""; @@ -100,6 +106,12 @@ $scope.fn.formSubmit(); } + // �옄�룞醫낅즺 �꽕�젙 珥덇린�솕 + function resetCompleteIssueStatus() { + $scope.vm.completeIssueStatusId = ""; + } + + // �븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐� 珥덇린�솕(以묐났泥섎━�븷 �빆紐�) function resetOverlap() { $scope.vm.form.customFieldIds = []; $scope.fn.form.formSubmitOverlap(); @@ -113,11 +125,10 @@ Api.findApiOverlap($resourceProvider.getContent( conditions, $resourceProvider.getPageContent(0, 1000))).then(function (result) { if (result.data.message.status === "success") { - - let customFieldApiOverlaps = result.data.data; $scope.vm.form.customFields = []; + let customFieldApiOverlaps = result.data.data; - if (customFieldApiOverlaps != null) { + if (customFieldApiOverlaps != null && customFieldApiOverlaps.length > 0) { customFieldApiOverlaps.forEach(function (customFieldApiOverlap) { $scope.vm.form.customFields.push(customFieldApiOverlap.customFieldVo); }); @@ -129,6 +140,12 @@ }); } + $scope.$watch("vm.issueTypeId", function (newValue, oldValue){ + if (newValue != null && newValue !== "") { + $scope.fn.loadPage(); + } + }); + function getIssueTypes() { var conditions = { }; @@ -138,12 +155,19 @@ if (result.data.message.status === "success") { $scope.vm.issueTypes = result.data.data; if ($scope.vm.issueTypes != null && $scope.vm.issueTypes.length > 0) { - $scope.vm.issueTypeId = $scope.vm.issueTypes[0].id.toString(); - if ($scope.vm.tab === "API_COL_SETTING") { - $scope.fn.onChangeIssueType(); - } else if ($scope.vm.tab === "API_SPEC_SETTING") { - $scope.fn.onChangeIssueTypeSpec(); + if ($scope.vm.issueTypeId === "") { + $scope.vm.issueTypeId = $scope.vm.issueTypes[0].id.toString(); } + if ($scope.vm.tab === "") { + $scope.fn.changeTab("API_COL_SETTING"); + } + + // if ($scope.vm.tab === "API_COL_SETTING") { + // $scope.fn.onChangeIssueType(); + // } else if ($scope.vm.tab === "API_SPEC_SETTING") { + // $scope.fn.onChangeIssueTypeSpec(); + // } else if ($scope.vm.tab === "API_OVERLAP_SETTING") { + // } } } else { @@ -165,6 +189,7 @@ } function onChangeIssueTypeOverlap() { + $scope.fn.getIssueTypeCustomFields(); $scope.fn.getOverlapList(); } @@ -177,7 +202,6 @@ Api.findApiDefault($resourceProvider.getContent( conditions, $resourceProvider.getPageContent(0, 1000))).then(function (result) { $scope.fn.initForm(); - $scope.fn.getIssueTypeCustomFields(); if (result.data.message.status === "success") { if (angular.isDefined(result.data.data)) { @@ -197,6 +221,26 @@ }); } + } + + function formSubmitCompleteIssueStatus() { + if ($scope.vm.issueTypeId != null) { + let content = { + id: $scope.vm.issueTypeId, + completeIssueStatusId: $scope.vm.completeIssueStatusId + } + + Api.saveCompleteIssueStatus($resourceProvider.getContent( + content, $resourceProvider.getPageContent(0, 1000))).then(function (result) { + + if (result.data.message.status === "success") { + SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "�꽕�젙 �꽦怨�" + $scope.fn.getIssueTypes(); + } else { + SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "�꽕�젙 �떎�뙣" + } + }); + } } // �뤌 泥댄겕 @@ -290,17 +334,18 @@ }); } - // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 + // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 function getIssueTypeCustomFields() { $scope.vm.form.issueCustomFields = []; var issueTypeVo = $scope.fn.getCurrentIssueTypeVo(); + var projectId = $scope.vm.projectId; - if (issueTypeVo == null) return; + if (issueTypeVo == null || projectId == null) return; IssueTypeCustomField.find($resourceProvider.getContent({ - projectId : $scope.vm.projectId, + projectId : projectId, IssueTypeId : issueTypeVo.id }, $resourceProvider.getPageContent(0, 1000))).then(function (result) { $scope.vm.form.issueCustomFields = []; @@ -321,6 +366,7 @@ } + // 以묒슂�룄 紐⑸줉 function getSeverities() { Severity.find($resourceProvider.getContent({}, @@ -335,19 +381,6 @@ }); } - $rootScope.$on("changeColumnSettingTab", function (event, args){ - $scope.fn.start(); - }); - - - $rootScope.$on("changeOverlapSettingTab", function (event, args){ - $scope.fn.getOverlapList(); - }); - - $rootScope.$on("changeSpecSettingTab", function (event, args){ - $scope.fn.loadSpec(); - }); - $scope.$on("getIssueTypeListComplete", function (event, args) { if ($scope.vm.tab === "API_SPEC_SETTING") { $scope.fn.createRequestAddJson(); @@ -357,36 +390,80 @@ function changeTab(tab) { $scope.vm.tab = tab; + $scope.fn.loadPage(); + } + + // �쁽�옱 �꺆 �럹�씠吏� 遺덈윭�삤湲� + function loadPage() { + let tab = $scope.vm.tab; if (tab === "API_COL_SETTING") { - $rootScope.$broadcast("changeColumnSettingTab"); + $scope.fn.onChangeColumnSetting(); } else if (tab === "API_OVERLAP_SETTING") { - $rootScope.$broadcast("changeOverlapSettingTab"); + $scope.fn.getIssueStatuses(); + $scope.fn.onChangeIssueTypeOverlap(); } else if (tab === "API_SPEC_SETTING") { - $rootScope.$broadcast("changeSpecSettingTab"); + $scope.fn.onChangeIssueTypeSpec(); } } + $scope.$on("getIssueStatusComplete", function (event, args){ + if ($scope.vm.tab === "API_OVERLAP_SETTING") { + if ($scope.vm.issueStatuses != null) { + $scope.vm.completeIssueStatuses = []; + + $scope.vm.issueStatuses.forEach(function (issueStatus) { + if (issueStatus.issueStatusType === "CLOSE") { + $scope.vm.completeIssueStatuses.push(issueStatus); + } + }); + + // �꽕�젙�맂 �긽�깭 吏��젙 + $scope.vm.completeIssueStatusId = ""; + let issueTypeVo = $scope.fn.getCurrentIssueTypeVo(); + if (issueTypeVo.completeIssueStatusVo != null) { + $scope.vm.completeIssueStatuses.forEach(function (issueStatus) { + if (issueStatus.id === issueTypeVo.completeIssueStatusVo.id) { + $scope.vm.completeIssueStatusId = issueStatus.id.toString(); + } + }); + } + } + } + }); + function getIssueStatuses() { var condition = { - issueTypeId : $scope.vm.issueTypeId + issueTypeId: $scope.vm.issueTypeId } IssueStatus.findIssueStatusesByIssueType($resourceProvider.getContent(condition, $resourceProvider.getPageContent(0, 1000))).then(function (result) { if (result.data.message.status === "success") { $scope.vm.issueStatuses = result.data.data; - if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) { - $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString(); + + // $scope.vm.issueStatusId = ""; + if ($scope.vm.issueTypeId === "") { + if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) { + $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString(); + } } - } - else { + $scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses); + } else { SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣 } }); } + function onChangeColumnSetting() { + $scope.fn.getSeverities(); + $scope.fn.getPriorities(); + $scope.fn.onChangeIssueType(); + } + + function onChangeIssueTypeSpec() { + $scope.fn.getIssueStatuses(); $scope.fn.getIssueTypeCustomFields(); } @@ -422,7 +499,6 @@ var jsonData = { token: "||諛쒓툒諛쏆� �넗�겙||", - title: "||�씠�뒋 �젣紐�||", issueTypeId: $scope.vm.issueTypeId, apiType: "modify", issueStatusId: $scope.vm.issueStatusId, @@ -432,7 +508,18 @@ $scope.vm.sampleJsonModify = JSON.stringify(jsonData, undefined, 2); } - function getProjectList() { + $scope.$watch(function() { + return $rootScope.projects; + }, function() { + if ($rootScope.projects != null && $rootScope.projects.length > 0) { + // 怨듯넻 �뜲�씠�꽣 遺덈윭�삤湲� + $scope.fn.getProjects(); + $scope.fn.getIssueTypes(); + } + }, true); + + + function getProjects() { if ($rootScope.projects != null) { $scope.vm.projects = []; $rootScope.projects.forEach(function (project){ @@ -440,24 +527,13 @@ $scope.vm.projects.push(project); } }); - $scope.vm.projectId = $scope.vm.projects[0].id.toString(); + + if ( $scope.vm.projects.length > 0) { + $scope.vm.projectId = $scope.vm.projects[0].id.toString(); + } } } - - function loadSpec() { - $scope.fn.getIssueStatuses(); - $scope.fn.getIssueTypeCustomFields(); - } - - function start() { - $scope.fn.initForm(); - $scope.fn.getProjectList(); - $scope.fn.getSeverities(); - $scope.fn.getPriorities(); - $scope.fn.getIssueTypes(); - } - $scope.fn.start(); }]); }); -- Gitblit v1.8.0