From f3d433b269f28e99dd352f5b69f8ef864c09e5b0 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 29 11월 2021 14:33:06 +0900
Subject: [PATCH] - api 기본값 설정 기능 완료 - api 중복 필드 설정 기능 완료
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 145 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 128 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index a96bc8c..31a58c5 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -7,8 +7,8 @@
'app', 'angular'
],
function (app, angular) {
- app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert', '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert, $timeout, $filter, $injector, $controller, Api, Priority, Severity) {
+ app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert', '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert, $timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType) {
$scope.fn = {
changeTab : changeTab,
@@ -19,7 +19,15 @@
initForm : initForm,
getPriorities : getPriorities,
getSeverities : getSeverities,
- start : start
+ start : start,
+ getIssueTypes : getIssueTypes,
+ onChangeIssueType : onChangeIssueType,
+ reset : reset,
+ resetOverlap : resetOverlap,
+ formSubmitOverlap : formSubmitOverlap,
+ removeCustomField : removeCustomField,
+ getOverlapList : getOverlapList,
+ onChangeIssueTypeOverlap : onChangeIssueTypeOverlap
};
$scope.vm = {
@@ -34,8 +42,10 @@
description : "",
priorityId : "",
severityId : "",
+ customFields : [],
// projectName : "",
- }
+ },
+ customFieldId : "",
},
autoCompletePage : {
@@ -48,7 +58,9 @@
// totalPage : 0
// }
},
+ issueTypeId : "",
issueTypeName : "",
+ customFieldName : "",
issueTypeData : null // �씠�뒋 �쑀�삎 媛앹껜
};
@@ -61,22 +73,75 @@
$scope.vm.form.issueApiDefault.severityId = "";
}
- // �씠�뒋 �쑀�삎 �겢由��떆
- $scope.$on("onClickIssueType", function (evnet, args) {
- if (args != null && args.length > 0) {
+ function reset() {
+ $scope.fn.initForm();
+ $scope.fn.formSubmit();
+ }
+ function resetOverlap() {
+ $scope.vm.form.customFieldIds = [];
+ $scope.fn.form.formSubmitOverlap();
+ }
+
+ function getOverlapList() {
+ let conditions = {
+ issueTypeId: $scope.vm.issueTypeId
+ }
+
+ 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 = [];
+
+ customFieldApiOverlaps.forEach(function (customFieldApiOverlap) {
+ $scope.vm.form.customFields.push(customFieldApiOverlap.customFieldVo);
+ });
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+ }
+
+ function getIssueTypes() {
+ var conditions = {
+ };
+
+ IssueType.find($resourceProvider.getContent(
+ conditions, $resourceProvider.getPageContent(0, 1000))).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.onChangeIssueType();
+ }
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+ }
+
+ function onChangeIssueTypeOverlap() {
+ $scope.fn.getOverlapList();
+ }
+
+ function onChangeIssueType() {
+ if ($scope.vm.issueTypeId != null) {
let conditions = {
- issueTypeId: args[0].id
+ issueTypeId: $scope.vm.issueTypeId
}
Api.findApiDefault($resourceProvider.getContent(
- conditions, $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ 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.toString();
- $scope.vm.form.issueApiDefault.severityId = result.data.data.severityId.toString();
+ $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 = [];
@@ -88,7 +153,8 @@
}
});
}
- });
+
+ }
// �뤌 泥댄겕
function formCheck(formInvalid) {
@@ -100,11 +166,11 @@
}
function formSubmit() {
- if ($scope.vm.issueTypes == null || $scope.vm.issueTypes.length === 0)
+ if ($scope.vm.issueTypeId == null)
return;
let condition = {
- issueTypeId : $scope.vm.issueTypes[0].id,
+ 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,
priorityId : $scope.vm.form.issueApiDefault.priorityId,
@@ -116,10 +182,45 @@
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- SweetAlert.swal($filter("translate")("api.successToApiIssueDefault"), result.data.message.message, "success"); // "api �넗�겙 �깮�꽦 �꽦怨�"
+ SweetAlert.swal($filter("translate")("api.successToApiIssueDefault"), result.data.message.message, "success"); // "api 湲곕낯媛� �꽕�젙 �꽦怨�"
}
else {
- SweetAlert.swal($filter("translate")("api.failedToApiIssueDefault"), result.data.message.message, "error"); // "api �넗�겙 �깮�꽦 �떎�뙣"
+ SweetAlert.swal($filter("translate")("api.failedToApiIssueDefault"), result.data.message.message, "error"); // "api 湲곕낯媛� �꽕�젙 �떎�뙣"
+ }
+ });
+ }
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 �꽑�깮 �빆紐� �궘�젣
+ function removeCustomField(index) {
+ $scope.vm.form.customFields.splice(index, 1);
+ }
+
+ // 以묐났 �빆紐� �쟾�넚
+ function formSubmitOverlap() {
+ if ($scope.vm.issueTypeId === null)
+ return;
+
+ let condition = {
+ issueTypeId : $scope.vm.issueTypeId,
+ customFieldIds : (function () {
+ var ids = [];
+
+ angular.forEach($scope.vm.form.customFields, function (customField) {
+ ids.push(customField.id);
+ });
+
+ return ids;
+ })(),
+ }
+
+ Api.modifyApiOverlap($resourceProvider.getContent(condition,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ SweetAlert.swal($filter("translate")("api.successToApiIssueOverlap"), result.data.message.message, "success"); // "api 以묐났媛� �꽕�젙 �꽦怨�"
+ }
+ else {
+ SweetAlert.swal($filter("translate")("api.failedToApiIssueOverlap"), result.data.message.message, "error"); // "api 以묐났媛� �꽕�젙 �떎�뙣"
}
});
}
@@ -160,6 +261,15 @@
});
}
+ $rootScope.$on("changeColumnSettingTab", function (event, args){
+ $scope.fn.start();
+ });
+
+
+ $rootScope.$on("changeOverlapSettingTab", function (event, args){
+ $scope.fn.getOverlapList();
+ });
+
function changeTab(tab) {
$scope.vm.tab = tab;
@@ -175,8 +285,9 @@
$scope.fn.initForm();
$scope.fn.getSeverities();
$scope.fn.getPriorities();
+ $scope.fn.getIssueTypes();
}
-
$scope.fn.start();
+
}]);
});
--
Gitblit v1.8.0