From e667982e30dbf36b093132c7293d63e12242fb51 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 10:47:58 +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 | 260 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 229 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index 9031cce..acb070f 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -7,8 +7,12 @@
'app', 'angular'
],
function (app, angular) {
- app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert', '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType', 'IssueTypeCustomField',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert, $timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType, IssueTypeCustomField) {
+ app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert',
+ '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType', 'IssueTypeCustomField',
+ 'IssueStatus',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert,
+ $timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType, IssueTypeCustomField,
+ IssueStatus) {
$scope.fn = {
changeTab : changeTab,
@@ -19,7 +23,7 @@
initForm : initForm,
getPriorities : getPriorities,
getSeverities : getSeverities,
- start : start,
+ onChangeColumnSetting : onChangeColumnSetting,
getIssueTypes : getIssueTypes,
onChangeIssueType : onChangeIssueType,
reset : reset,
@@ -29,14 +33,28 @@
getOverlapList : getOverlapList,
onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
getIssueTypeCustomFields : getIssueTypeCustomFields,
- getCurrentIssueTypeVo : getCurrentIssueTypeVo
+ getCurrentIssueTypeVo : getCurrentIssueTypeVo,
+ getIssueStatuses : getIssueStatuses,
+ onChangeIssueTypeSpec : onChangeIssueTypeSpec,
+ createRequestModifyJson : createRequestModifyJson,
+ createRequestAddJson : createRequestAddJson,
+ createCustomFields : createCustomFields,
+ getProjects : getProjects,
+ formSubmitCompleteIssueStatus : formSubmitCompleteIssueStatus,
+ loadPage : loadPage,
+ resetCompleteIssueStatus : resetCompleteIssueStatus
};
$scope.vm = {
- tab : "API_COL_SETTING",
+ tab : "",
issueTypes : [],
+ issueStatuses : [],
+ completeIssueStatuses : [],
severities : [],
priorities : [],
+ projects : [],
+ sampleJsonAdd : "",
+ sampleJsonModify : "",
// projects : [],
form : {
issueCustomFields : [],
@@ -61,9 +79,17 @@
// totalPage : 0
// }
},
+ completeIssueStatusId : "",
issueTypeId : "",
issueTypeName : "",
+
+ issueStatusId : "",
+ issueStatusName : "",
+
customFieldName : "",
+
+ projectId : "",
+ projectName : "",
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -80,6 +106,12 @@
$scope.fn.formSubmit();
}
+ // �옄�룞醫낅즺 �꽕�젙 珥덇린�솕
+ function resetCompleteIssueStatus() {
+ $scope.vm.completeIssueStatusId = "";
+ }
+
+ // �븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐� 珥덇린�솕(以묐났泥섎━�븷 �빆紐�)
function resetOverlap() {
$scope.vm.form.customFieldIds = [];
$scope.fn.form.formSubmitOverlap();
@@ -93,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);
});
@@ -109,6 +140,12 @@
});
}
+ $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
+ if (newValue != null && newValue !== "") {
+ $scope.fn.loadPage();
+ }
+ });
+
function getIssueTypes() {
var conditions = {
};
@@ -118,8 +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();
- $scope.fn.onChangeIssueType();
+ 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 {
@@ -141,6 +189,7 @@
}
function onChangeIssueTypeOverlap() {
+ $scope.fn.getIssueTypeCustomFields();
$scope.fn.getOverlapList();
}
@@ -153,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)) {
@@ -173,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"); // "�꽕�젙 �떎�뙣"
+ }
+ });
+ }
}
// �뤌 泥댄겕
@@ -266,32 +334,37 @@
});
}
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
function getIssueTypeCustomFields() {
$scope.vm.form.issueCustomFields = [];
var issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
- if (issueTypeVo.projectVo == null) return;
+ var projectId = $scope.vm.projectId;
+
+ if (issueTypeVo == null || projectId == null) return;
IssueTypeCustomField.find($resourceProvider.getContent({
- projectId : issueTypeVo.projectVo.id,
+ projectId : projectId,
IssueTypeId : issueTypeVo.id },
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
-
+ $scope.vm.form.issueCustomFields = [];
if (result.data.message.status === "success") {
- $scope.vm.form.issueCustomFields = [];
angular.forEach(result.data.data, function (issueTypeCustomField) {
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
});
+
+ $scope.$broadcast("getIssueTypeListComplete", $scope.vm.form.issueCustomFields);
}
else {
+
SweetAlert.swal($filter("translate")("issue.failedToUserDefinedFieldListAssociatedLookup"), result.data.message.message, "error"); // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣
}
});
}
+
// 以묒슂�룄 紐⑸줉
@@ -308,34 +381,159 @@
});
}
- $rootScope.$on("changeColumnSettingTab", function (event, args){
- $scope.fn.start();
+ $scope.$on("getIssueTypeListComplete", function (event, args) {
+ if ($scope.vm.tab === "API_SPEC_SETTING") {
+ $scope.fn.createRequestAddJson();
+ $scope.fn.createRequestModifyJson();
+ }
});
-
-
- $rootScope.$on("changeOverlapSettingTab", function (event, args){
- $scope.fn.getOverlapList();
- });
-
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") {
+ $scope.fn.onChangeIssueTypeSpec();
}
}
- function start() {
- $scope.fn.initForm();
+ $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
+ }
+ IssueStatus.findIssueStatusesByIssueType($resourceProvider.getContent(condition,
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $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();
+ }
+ }
+ $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.getIssueTypes();
-
+ $scope.fn.onChangeIssueType();
}
- $scope.fn.start();
+
+
+ function onChangeIssueTypeSpec() {
+ $scope.fn.getIssueStatuses();
+ $scope.fn.getIssueTypeCustomFields();
+ }
+
+ // �슂泥� �뜲�씠�꽣 留뚮뱾湲�( 異붽�)
+ function createRequestAddJson() {
+ var customFields = $scope.fn.createCustomFields();
+
+ var jsonData = {
+ token: "||諛쒓툒諛쏆� �넗�겙}||",
+ title: "||�씠�뒋 �젣紐�||",
+ issueTypeId: $scope.vm.issueTypeId,
+ apiType: "add",
+ customFields : customFields
+ };
+
+ $scope.vm.sampleJsonAdd = JSON.stringify(jsonData,undefined, 4);
+ }
+
+ function createCustomFields() {
+ var customFields = [];
+ $scope.vm.form.issueCustomFields.forEach(function (issueCustomField){
+ customFields.push({
+ customFieldId: issueCustomField.customFieldVo.id,
+ useValue: "||�엯�젰媛�||"
+ })
+ });
+ return customFields;
+ }
+
+ // �슂泥� �뜲�씠�꽣 留뚮뱾湲�(�닔�젙)
+ function createRequestModifyJson() {
+ var customFields = $scope.fn.createCustomFields();
+
+ var jsonData = {
+ token: "||諛쒓툒諛쏆� �넗�겙||",
+ issueTypeId: $scope.vm.issueTypeId,
+ apiType: "modify",
+ issueStatusId: $scope.vm.issueStatusId,
+ customFields : customFields
+ };
+
+ $scope.vm.sampleJsonModify = JSON.stringify(jsonData, undefined, 2);
+ }
+
+ $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){
+ if (project.id > -1) {
+ $scope.vm.projects.push(project);
+ }
+ });
+
+ if ( $scope.vm.projects.length > 0) {
+ $scope.vm.projectId = $scope.vm.projects[0].id.toString();
+ }
+ }
+ }
+
}]);
});
--
Gitblit v1.8.0