From 6bd87f2bc7af7361f126451b95dc279b44e9f138 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 17:42:16 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 191 +++++++++++++++++++++++++++++------------------
1 files changed, 117 insertions(+), 74 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index acb070f..2f7e1f6 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -9,23 +9,23 @@
function (app, angular) {
app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert',
'$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType', 'IssueTypeCustomField',
- 'IssueStatus',
+ 'IssueStatus', '$q',
function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert,
$timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType, IssueTypeCustomField,
- IssueStatus) {
+ IssueStatus, $q) {
$scope.fn = {
changeTab : changeTab,
getIssueTypeCallback : getIssueTypeCallback,
getProjectListCallback : getProjectListCallback,
- formSubmit : formSubmit,
+ formSubmitColumnSetting : formSubmitColumnSetting,
formCheck : formCheck,
initForm : initForm,
getPriorities : getPriorities,
getSeverities : getSeverities,
onChangeColumnSetting : onChangeColumnSetting,
+ onChangeEndIssueStatus : onChangeEndIssueStatus,
getIssueTypes : getIssueTypes,
- onChangeIssueType : onChangeIssueType,
reset : reset,
resetOverlap : resetOverlap,
formSubmitOverlap : formSubmitOverlap,
@@ -42,7 +42,10 @@
getProjects : getProjects,
formSubmitCompleteIssueStatus : formSubmitCompleteIssueStatus,
loadPage : loadPage,
- resetCompleteIssueStatus : resetCompleteIssueStatus
+ resetCompleteIssueStatus : resetCompleteIssueStatus,
+ findIssueList : findIssueList,
+ onChangeProject : onChangeProject,
+ setApiIssueTypeStatus : setApiIssueTypeStatus
};
$scope.vm = {
@@ -103,7 +106,7 @@
function reset() {
$scope.fn.initForm();
- $scope.fn.formSubmit();
+ $scope.fn.formSubmitColumnSetting();
}
// �옄�룞醫낅즺 �꽕�젙 珥덇린�솕
@@ -158,9 +161,7 @@
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();
@@ -188,46 +189,23 @@
return issueTypeVo;
}
- function onChangeIssueTypeOverlap() {
- $scope.fn.getIssueTypeCustomFields();
- $scope.fn.getOverlapList();
+ // �옄�룞 �룞猷� �씠�뒋 �긽�깭 蹂�寃쎌떆
+ function onChangeEndIssueStatus() {
+
}
- function onChangeIssueType() {
- if ($scope.vm.issueTypeId != null) {
- let conditions = {
- issueTypeId: $scope.vm.issueTypeId
- }
-
- Api.findApiDefault($resourceProvider.getContent(
- conditions, $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- $scope.fn.initForm();
-
- if (result.data.message.status === "success") {
- if (angular.isDefined(result.data.data)) {
- $scope.vm.form.issueApiDefault = result.data.data;
- $scope.vm.form.issueApiDefault.priorityId = result.data.data.priorityId != null ? result.data.data.priorityId.toString() : "";
- $scope.vm.form.issueApiDefault.severityId = result.data.data.severityId != null ? result.data.data.severityId.toString() : "";
-
-
- // if (angular.isDefined(result.data.data.projectVo)) {
- // $scope.vm.projects = [];
- // $scope.vm.projects.push(result.data.data.projectVo);
- // }
- }
- } else {
- SweetAlert.swal($filter("translate")("common.failedToIssueTypeDefault"), result.data.message.message, "error"); // "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣"
- }
- });
- }
-
+ function onChangeIssueTypeOverlap() {
+ $scope.fn.getIssueStatuses();
+ $scope.fn.getIssueTypeCustomFields();
+ $scope.fn.getOverlapList();
}
function formSubmitCompleteIssueStatus() {
if ($scope.vm.issueTypeId != null) {
let content = {
- id: $scope.vm.issueTypeId,
- completeIssueStatusId: $scope.vm.completeIssueStatusId
+ issueTypeId : $scope.vm.issueTypeId,
+ projectId : $scope.vm.projectId,
+ issueStatusId: $scope.vm.completeIssueStatusId === "none" ? null : $scope.vm.completeIssueStatusId
}
Api.saveCompleteIssueStatus($resourceProvider.getContent(
@@ -235,7 +213,8 @@
if (result.data.message.status === "success") {
SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "�꽕�젙 �꽦怨�"
- $scope.fn.getIssueTypes();
+ //$scope.fn.getIssueTypes();
+ $scope.fn.findIssueList($scope.vm.projectId);
} else {
SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "�꽕�젙 �떎�뙣"
}
@@ -252,14 +231,14 @@
return false;
}
- function formSubmit() {
+ function formSubmitColumnSetting() {
if ($scope.vm.issueTypeId == null)
return;
let condition = {
issueTypeId : $scope.vm.issueTypeId,
title : $scope.vm.form.issueApiDefault.title,
- // projectId : $scope.vm.projects != null && $scope.vm.projects.length > 0 ? $scope.vm.projects[0].id : null,
+ projectId : $scope.vm.projectId,
priorityId : $scope.vm.form.issueApiDefault.priorityId,
severityId : $scope.vm.form.issueApiDefault.severityId,
description : $scope.vm.form.issueApiDefault.description,
@@ -289,6 +268,7 @@
let condition = {
issueTypeId : $scope.vm.issueTypeId,
+ projectId : $scope.vm.projectId,
customFieldIds : (function () {
var ids = [];
@@ -400,37 +380,35 @@
if (tab === "API_COL_SETTING") {
$scope.fn.onChangeColumnSetting();
} else if (tab === "API_OVERLAP_SETTING") {
- $scope.fn.getIssueStatuses();
$scope.fn.onChangeIssueTypeOverlap();
} else if (tab === "API_SPEC_SETTING") {
$scope.fn.onChangeIssueTypeSpec();
}
}
- $scope.$on("getIssueStatusComplete", function (event, args){
- if ($scope.vm.tab === "API_OVERLAP_SETTING") {
- if ($scope.vm.issueStatuses != null) {
- $scope.vm.completeIssueStatuses = [];
+ // �옄�룞 醫낅즺 �씠�뒋 �긽�깭 �쟻�슜
+ function setApiIssueTypeStatus() {
+ 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.issueStatuses.forEach(function (issueStatus) {
+ if (issueStatus.issueStatusType === "CLOSE") {
+ $scope.vm.completeIssueStatuses.push(issueStatus);
+ }
+ });
+
+ // �꽕�젙�맂 �긽�깭 吏��젙
+ $scope.vm.completeIssueStatusId = "none";
+ 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();
}
});
-
- // �꽕�젙�맂 �긽�깭 吏��젙
- $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 = {
@@ -443,11 +421,14 @@
$scope.vm.issueStatuses = result.data.data;
// $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();
- }
+ if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
+ $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString();
}
+
+ if ($scope.vm.tab === "API_OVERLAP_SETTING") {
+ $scope.fn.setApiIssueTypeStatus();
+ }
+
$scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
} else {
SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣
@@ -456,11 +437,70 @@
}
function onChangeColumnSetting() {
- $scope.fn.getSeverities();
- $scope.fn.getPriorities();
- $scope.fn.onChangeIssueType();
+ var promises = {
+ severities : $scope.fn.getSeverities(),
+ priorities : $scope.fn.getPriorities(),
+ }
+ $q.all(promises).then(function (results) {
+ if ($scope.vm.issueTypeId != null && $scope.vm.issueTypeId !== "none") {
+ let conditions = {
+ issueTypeId: $scope.vm.issueTypeId
+ }
+
+ Api.findApiDefault($resourceProvider.getContent(
+ conditions, $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+ $scope.fn.initForm();
+
+ if (result.data.message.status === "success") {
+ if (angular.isDefined(result.data.data)) {
+ $scope.vm.form.issueApiDefault = result.data.data;
+ $scope.vm.form.issueApiDefault.priorityId = result.data.data.priorityId != null ? result.data.data.priorityId.toString() : "";
+ $scope.vm.form.issueApiDefault.severityId = result.data.data.severityId != null ? result.data.data.severityId.toString() : "";
+ }
+ } else {
+ SweetAlert.swal($filter("translate")("common.failedToIssueTypeDefault"), result.data.message.message, "error"); // "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+ }
+
+ });
}
+ // �봽濡쒖젥�듃 蹂�寃쎌떆
+ function onChangeProject() {
+ $scope.fn.findIssueList($scope.vm.projectId);
+ }
+
+ // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
+ function findIssueList(projectId) {
+ if ($rootScope.projects == null || $rootScope.projects.length <= 1)
+ return;
+
+ // �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = {
+ projectId : projectId > -1 ? projectId : null,
+ useProject : true,
+ deep : "01" // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� 李얜뒗�떎.
+ }
+ IssueType.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 100))).then(function (result) {
+
+ 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();
+ $scope.fn.getIssueStatuses();
+ $scope.fn.getIssueTypeCustomFields();
+ } else {
+ $scope.vm.issueTypeId = "none";
+ }
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
+ }
+
+ });
+ }
function onChangeIssueTypeSpec() {
$scope.fn.getIssueStatuses();
@@ -514,7 +554,8 @@
if ($rootScope.projects != null && $rootScope.projects.length > 0) {
// 怨듯넻 �뜲�씠�꽣 遺덈윭�삤湲�
$scope.fn.getProjects();
- $scope.fn.getIssueTypes();
+ $scope.fn.findIssueList($scope.vm.projectId);
+ // $scope.fn.getIssueTypes();
}
}, true);
@@ -534,6 +575,8 @@
}
}
-
+ if ($scope.vm.tab === "") {
+ $scope.fn.changeTab("API_COL_SETTING");
+ }
}]);
});
--
Gitblit v1.8.0