From 125084f587f86785cda54223848b6ae22310af59 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 14:35:53 +0900
Subject: [PATCH] 업체에서 여러 이메일 추가 시 이슈에서 메일 보낼 때 분리
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 123 ++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index f62d60f..19fba25 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -97,6 +97,7 @@
hideCompleteIssue : false,
hideDownIssue : true,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
+ allIssue : false
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -159,7 +160,7 @@
}
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
- function getVmSearchObject(keyWord = null) {
+ function getVmSearchObject(keyWord = null, allIssue = false) {
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -173,9 +174,9 @@
// $scope.vm.projects = issueListSearchObject.projects;
// $scope.vm.registers = issueListSearchObject.registers;
- $scope.fn.getPageList(0, true, keyWord);
+ $scope.fn.getPageList(0, true, keyWord, allIssue);
} else {
- $scope.fn.getPageList(0, false, keyWord);
+ $scope.fn.getPageList(0, false, keyWord, allIssue);
}
}
else {
@@ -183,9 +184,10 @@
}
});
}
+ $scope.vm.issueIds = [];
// �긽�꽭 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
- function changeDetailView(id) {
+ function changeDetailView(id, isBack = false) {
$scope.vm.tableConfigs = [];
$scope.vm.detailView = true;
@@ -196,6 +198,10 @@
// �뀒�씠釉붿쓣 �떎�떆 洹몃┫�닔 �엳寃� �뜲�씠�꽣 諛붿씤�뵫�쓣 �떎�떆�븳�떎.
var temp = angular.copy($scope.vm.responseData.data);
$scope.vm.responseData.data = angular.copy(temp);
+
+ if (!isBack) {
+ $scope.vm.issueIds.push(id);
+ }
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
@@ -207,6 +213,7 @@
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
+ $scope.vm.issueIds = [];
$scope.vm.detailView = false;
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
@@ -330,7 +337,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueNumber") /* todo �씠嫄� ���씠��濡� 蹂�寃쏀빐�빞�븯�뒗�뜲*/
+ .setDName("issueTitle")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -367,7 +374,7 @@
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("departmentName") /* todo 泥댄겕*/
+ .setDName("departmentName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -385,7 +392,6 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("startDate")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -407,6 +413,33 @@
.setDAlign("text-center")
.setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
+ break;
+ case "COMPANY" : // �뾽泥�
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.company")
+ .setDName("companyName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_COMPANY"));
+ break;
+ case "ISP" : // ISP
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.isp")
+ .setDName("ispName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_ISP"));
+ break;
+ case "HOSTING" : // HOSTING
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.hosting")
+ .setDName("hostingName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_HOSTING"));
break;
}
@@ -449,6 +482,7 @@
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
function makeSearchConditions() {
var conditions = {
+ allIssue : $scope.vm.allIssue,
keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
@@ -582,6 +616,7 @@
}
return conditions;
+
}
function getTreeList() {
@@ -589,10 +624,14 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false, keyWord = null) {
+ function getPageList(selectedPage, detail = false, keyWord = null, allIssue = false) {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
+ }
+ if (allIssue) {
+ $scope.vm.allIssue = true;
+ $rootScope.$broadcast("getAllIssuePageList");
}
if (keyWord != null) {
@@ -657,6 +696,9 @@
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
+ $scope.vm.page.selectedPage = currentPage + 1;
+ $scope.vm.responseData = result.data;
+
if (result.data.data != null && result.data.data.length > 0) {
//var resultSize = result.data.data.length;
for (var i = 0; i < result.data.data.length; i++) {
@@ -677,14 +719,14 @@
$scope.vm.projectKey = result.data.data[0].projectKey;
$scope.vm.issueNumber = result.data.data[0].issueNumber;
$scope.vm.projectName = result.data.data[0].projectName;
- $scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
if (detail) {
changeDetailView(result.data.data[0].id);
}
} else {
- $scope.vm.responseData = result.data;
+ // 媛믪씠 �뾾�쓣�븣 媛믪쓣 �꽔�뼱二쇰젮怨� �븯�뒗 �쓽�룄
+ // $scope.vm.responseData = result.data;
+ result.data = $scope.vm.responseData;
}
}
else {
@@ -812,7 +854,7 @@
});
}
- function addRelationIssueForm(id) {
+ function addRelationIssueForm(id, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
@@ -822,13 +864,14 @@
parameter : function () {
return {
id : id,
+ issueTypeId : issueTypeId
};
}
}
});
}
- function addDownIssueForm(id) {
+ function addDownIssueForm(id, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddDown.html',
size : "lg",
@@ -838,6 +881,7 @@
parameter : function () {
return {
id : id,
+ issueTypeId : issueTypeId
};
}
}
@@ -1017,7 +1061,8 @@
resolve : {
parameter : function () {
return {
- issueTypeId : $scope.vm.issueTypeId
+ issueTypeId : $scope.vm.issueTypeId,
+ allIssue : $scope.vm.allIssue
};
}
}
@@ -1079,13 +1124,16 @@
var deferred = $q.defer();
$scope.vm.partners = [];
- Issue.findPartners($resourceProvider.getContent({},
+ Issue.findPartners($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.content;
+ angular.forEach(result.data.data, function (partner) {
+ $scope.vm.partners.push(partner);
+ });
+ //$scope.vm.partnerVos = result.data.data;
}
else {
- SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // �슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // �뙆�듃�꼫 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -1171,7 +1219,6 @@
break;
}
-
$scope.vm.customFields.push(customField);
});
}
@@ -1190,20 +1237,26 @@
function getIssueTableConfigs() {
var deferred = $q.defer();
- if ($rootScope.issueTypeMenu != null){
- var content = {
- issueTypeId : $rootScope.issueTypeMenu.id
+ var content = {
+ issueTypeId : (function () {
+ var id = "";
+ if ($rootScope.allIssueList) {
+ id = -1;
+ } else {
+ id = $rootScope.getCurrentIssueTypeId();
}
-
- IssueTableConfig.detail($resourceProvider.getContent(content,
- $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- if (result.data.message.status !== "success") {
- SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
- }
-
- deferred.resolve(result.data.data);
- });
+ return id;
+ })()
}
+
+ IssueTableConfig.detail($resourceProvider.getContent(content,
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+ if (result.data.message.status !== "success") {
+ SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
return deferred.promise;
}
@@ -1258,6 +1311,8 @@
// 理쒖큹 �떎�뻾
function startExecute() {
+ // �씠�뒋 �긽�꽭�솕硫� �씠�뒋 �씠�룞 �궡�뿭 ���옣
+ $scope.vm.issueIds = [];
// 荑좏궎 �씫湲�
var paramKeyWord = null;
@@ -1280,12 +1335,14 @@
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
}
+ var allIssue = $rootScope.allIssueList;
+
var promises = {
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
getIssueStatuses : $scope.fn.getIssueStatuses(),
- getCustomFields : $scope.fn.getCustomFields()
+ getCustomFields : $scope.fn.getCustomFields(),
};
$q.all(promises).then(function (results){
@@ -1309,9 +1366,9 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
- // �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
- $scope.fn.getVmSearchObject(paramKeyWord);
});
+ // �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
+ $scope.fn.getVmSearchObject(paramKeyWord, allIssue);
});
}
--
Gitblit v1.8.0