From ad486a401ad59d44bd4187f6406fe8c11b046a1f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 16:05:09 +0900
Subject: [PATCH] - 파트너 정보 엑셀 임포트 시 연락처, 코드, 이메일 유효성 검사 - 특정 프로젝트로 설정된 상태에서 타 프로젝트의 이슈 클릭 시 대시보드로 이동되는 문제 해결
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 270 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 180 insertions(+), 90 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index 70103fc..5d781a5 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -9,40 +9,46 @@
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,
+ onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
+ onChangeIssueTypeSpec : onChangeIssueTypeSpec,
+ onChangeProject : onChangeProject,
+ onChangeIssueStatus : onChangeIssueStatus,
getIssueTypes : getIssueTypes,
- onChangeIssueType : onChangeIssueType,
reset : reset,
resetOverlap : resetOverlap,
formSubmitOverlap : formSubmitOverlap,
removeCustomField : removeCustomField,
getOverlapList : getOverlapList,
- onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
getIssueTypeCustomFields : getIssueTypeCustomFields,
getCurrentIssueTypeVo : getCurrentIssueTypeVo,
getIssueStatuses : getIssueStatuses,
- onChangeIssueTypeSpec : onChangeIssueTypeSpec,
createRequestModifyJson : createRequestModifyJson,
createRequestAddJson : createRequestAddJson,
createCustomFields : createCustomFields,
getProjects : getProjects,
formSubmitCompleteIssueStatus : formSubmitCompleteIssueStatus,
loadPage : loadPage,
- resetCompleteIssueStatus : resetCompleteIssueStatus
+ resetCompleteIssueStatus : resetCompleteIssueStatus,
+ findIssueList : findIssueList,
+ setApiIssueTypeStatus : setApiIssueTypeStatus,
+ findToken : findToken,
+ createAPISample : createAPISample
};
$scope.vm = {
@@ -57,6 +63,7 @@
sampleJsonModify : "",
// projects : [],
form : {
+ token : "!�넗�겙媛믪엯�젰(�넗�겙諛쒓툒�븘�슂)!",
issueCustomFields : [],
issueApiDefault : {
title : "",
@@ -103,7 +110,7 @@
function reset() {
$scope.fn.initForm();
- $scope.fn.formSubmit();
+ $scope.fn.formSubmitColumnSetting();
}
// �옄�룞醫낅즺 �꽕�젙 珥덇린�솕
@@ -140,7 +147,7 @@
});
}
- $scope.$watch("vm.issueTypeId", function (newValue){
+ $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
if (newValue != null && newValue !== "") {
$scope.fn.loadPage();
}
@@ -158,9 +165,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,47 +193,23 @@
return issueTypeVo;
}
+ // �옄�룞 �룞猷� �씠�뒋 �긽�깭 蹂�寃쎌떆
+ function onChangeEndIssueStatus() {
+
+ }
+
function onChangeIssueTypeOverlap() {
$scope.fn.getIssueStatuses();
$scope.fn.getIssueTypeCustomFields();
$scope.fn.getOverlapList();
}
- 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 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(
@@ -236,9 +217,8 @@
if (result.data.message.status === "success") {
SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "�꽕�젙 �꽦怨�"
- $scope.fn.getIssueTypes();
- $scope.fn.getIssueStatuses();
- $scope.fn.getIssueTypeCustomFields();
+ //$scope.fn.getIssueTypes();
+ $scope.fn.findIssueList($scope.vm.projectId);
} else {
SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "�꽕�젙 �떎�뙣"
}
@@ -255,14 +235,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,
@@ -292,6 +272,7 @@
let condition = {
issueTypeId : $scope.vm.issueTypeId,
+ projectId : $scope.vm.projectId,
customFieldIds : (function () {
var ids = [];
@@ -339,7 +320,7 @@
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
function getIssueTypeCustomFields() {
-
+ var deferred = $q.defer();
$scope.vm.form.issueCustomFields = [];
var issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
@@ -358,7 +339,7 @@
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
});
- $scope.$broadcast("getIssueTypeListComplete", $scope.vm.form.issueCustomFields);
+ deferred.resolve(result.data.data);
}
else {
@@ -366,6 +347,7 @@
}
});
+ return deferred.promise;
}
@@ -384,12 +366,12 @@
});
}
- $scope.$on("getIssueTypeListComplete", function (event, args) {
- if ($scope.vm.tab === "API_SPEC_SETTING") {
- $scope.fn.createRequestAddJson();
- $scope.fn.createRequestModifyJson();
- }
- });
+ // $scope.$on("getIssueTypeListComplete", function (event, args) {
+ // if ($scope.vm.tab === "API_SPEC_SETTING") {
+ // $scope.fn.createRequestAddJson();
+ // $scope.fn.createRequestModifyJson();
+ // }
+ // });
function changeTab(tab) {
$scope.vm.tab = tab;
@@ -409,32 +391,32 @@
}
}
- $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 deferred = $q.defer();
var condition = {
issueTypeId: $scope.vm.issueTypeId
}
@@ -443,30 +425,112 @@
if (result.data.message.status === "success") {
$scope.vm.issueStatuses = result.data.data;
+ deferred.resolve(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();
}
- $scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
+
+ if ($scope.vm.tab === "API_OVERLAP_SETTING") {
+ $scope.fn.setApiIssueTypeStatus();
+ }
+
} else {
SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣
}
});
+ return deferred.promise;
}
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 createAPISample() {
+ $scope.fn.createRequestAddJson();
+ $scope.fn.createRequestModifyJson();
+ }
+
+ function onChangeIssueStatus() {
+ // $scope.fn.getIssueStatuses();
+ // $scope.fn.getIssueTypeCustomFields();
+ $scope.fn.findToken();
+ $scope.fn.createAPISample();
}
function onChangeIssueTypeSpec() {
- $scope.fn.getIssueStatuses();
- $scope.fn.getIssueTypeCustomFields();
+ var promises = {
+ issueStatues : $scope.fn.getIssueStatuses(),
+ issueTypeCustomFields : $scope.fn.getIssueTypeCustomFields(),
+ token : $scope.fn.findToken()
+ }
+ $q.all(promises).then(function (results) {
+ $scope.fn.createAPISample();
+ });
}
// �슂泥� �뜲�씠�꽣 留뚮뱾湲�( 異붽�)
@@ -474,7 +538,7 @@
var customFields = $scope.fn.createCustomFields();
var jsonData = {
- token: "||諛쒓툒諛쏆� �넗�겙}||",
+ token: $scope.vm.form.token,
title: "||�씠�뒋 �젣紐�||",
issueTypeId: $scope.vm.issueTypeId,
apiType: "add",
@@ -482,6 +546,29 @@
};
$scope.vm.sampleJsonAdd = JSON.stringify(jsonData,undefined, 4);
+ }
+
+
+ function findToken() {
+ var deferred = $q.defer();
+ var conditions = {
+ }
+
+ Api.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (result.data.data != null) {
+ $scope.vm.form.token = result.data.data.token;
+ }
+ deferred.resolve(result.data.data);
+ }
+ else {
+
+ }
+ });
+
+ return deferred.promise;
}
function createCustomFields() {
@@ -500,7 +587,7 @@
var customFields = $scope.fn.createCustomFields();
var jsonData = {
- token: "||諛쒓툒諛쏆� �넗�겙||",
+ token: $scope.vm.form.token,
issueTypeId: $scope.vm.issueTypeId,
apiType: "modify",
issueStatusId: $scope.vm.issueStatusId,
@@ -516,7 +603,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);
@@ -536,6 +624,8 @@
}
}
-
+ if ($scope.vm.tab === "") {
+ $scope.fn.changeTab("API_COL_SETTING");
+ }
}]);
});
--
Gitblit v1.8.0