From a8a8d35b27df67e169c8b1aab45edec1c1b25eae Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:48:04 +0900
Subject: [PATCH] - 이메일 실시간 발송 - 이슈 리스트에서 하위일감 개수 표시 - 이슈 리스트에서 하위 이슈는 안보이게
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 155 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 131 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 9b7b944..52e00e9 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -28,6 +28,7 @@
listView : listView, // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃�
importExcel : importExcel, // �뿊�� import 湲곕뒫 �뙘�뾽 �샇異�
getIssueTypes : getIssueTypes, // �씠�뒋 �쑀�삎 紐⑸줉�쓣 媛��졇�삩�떎.
+ getUsePartner : getUsePartner, // �씠�뒋 �쑀�삎 蹂� �궗�슜�븯�뒗 �뙆�듃�꼫 紐⑸줉�쓣 媛��졇�삩�떎.
getPriorities : getPriorities, // �슦�꽑�닚�쐞 紐⑸줉�쓣 媛��졇�삩�떎.
getSeverities : getSeverities, // 以묒슂�룄 紐⑸줉�쓣 媛��졇�삩�떎.
getIssueStatuses : getIssueStatuses, // �씠�뒋 �긽�깭 紐⑸줉�쓣 媛��졇�삩�떎.
@@ -41,7 +42,10 @@
// 蹂��닔
$scope.vm = {
+ issueTypeId : "",
+ partnerVos : "",
search : {
+ keyWord : "", // �쟾泥� 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
@@ -70,12 +74,15 @@
projects : [], // �봽濡쒖젥�듃
issueStatuses : [], // �씠�뒋 �긽�깭
issueTypes : [], // �씠�뒋 �쑀�삎
+ partners : [], // �씠�뒋 �쑀�삎
priorities : [], // �슦�꽑 �닚�쐞
severities : [], // 以묒슂�룄
users : [], // �떞�떦�옄
+ departments : [], // �떞�떦遺��꽌
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
- issueTableConfigs : [] // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ parentIssueId : ""
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -96,13 +103,16 @@
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
+ // 寃��깋 議곌굔�쓣 湲곗뼲�빐�꽌 �씠�뒋 �긽�꽭 �럹�씠吏�濡� �씠�룞
function makeVmSearchObject() {
var content = {
conditions : JSON.stringify({
search : $scope.vm.search,
projects : $scope.vm.projects,
users : $scope.vm.users,
- registers : $scope.vm.registers
+ departments : $scope.vm.departments,
+ registers : $scope.vm.registers,
+ parentIssueId : $scope.vm.parentIssueId
})
};
@@ -128,9 +138,10 @@
var issueListSearchObject = JSON.parse(result.data.data);
// �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
$scope.vm.search = issueListSearchObject.search;
- /*$scope.vm.users = issueListSearchObject.users;
- $scope.vm.projects = issueListSearchObject.projects;
- $scope.vm.registers = issueListSearchObject.registers;*/
+ // $scope.vm.users = issueListSearchObject.users;
+ // $scope.vm.departments = issueListSearchObject.departments;
+ // $scope.vm.projects = issueListSearchObject.projects;
+ // $scope.vm.registers = issueListSearchObject.registers;
$scope.fn.getPageList(0, true);
} else {
@@ -158,10 +169,11 @@
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : id
- });
+ // $scope.$broadcast("getIssueDetail", {
+ // id : id
+ // });
}
+
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
@@ -172,6 +184,7 @@
$scope.vm.responseData.data = angular.copy(temp);
// 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎.
$rootScope.currentDetailIssueId = null;
+ $scope.$broadcast("getIssueList", {id: $rootScope.currentDetailIssueId});
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -240,13 +253,13 @@
.setDAlign("text-center")
.setDName("issueTypeName"));
break;
- case "ASSIGNEETEAM" : // �떞�떦遺��꽌
+ case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_USER"));
+ .setDRenderer("ISSUE_DEPARTMENT"));
break;
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
@@ -270,6 +283,13 @@
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
+ break;
+ case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.countDownIssue")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("downIssueCount"));
break;
}
@@ -311,6 +331,7 @@
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
function makeSearchConditions() {
var conditions = {
+ keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
projectType : $scope.vm.search.projectType,
@@ -374,6 +395,15 @@
});
return userIds;
+ })(),
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+
+ return departmentIds;
})(),
registerIds : (function () {
var registerIds = [];
@@ -451,6 +481,7 @@
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
// $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ $scope.vm.search.issueTypeIds = [];
$scope.vm.search.issueTypeIds.push({
fieldKey : $rootScope.issueTypeMenu.id,
fieldValue : $rootScope.issueTypeMenu.name
@@ -465,6 +496,7 @@
if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
var find = findProjectSearch($rootScope.workProject.id);
if (!find) {
+ $scope.vm.projects = [];
$scope.vm.projects.push($rootScope.workProject);
}
}
@@ -476,9 +508,41 @@
$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 (detail) {
+ if (result.data.data != null && result.data.data.length > 0) {
+ $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
+ $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 {
+ SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
+ }
+ });
+ }
+
+ // �씠硫붿씪 �봽濡쒖젥�듃 寃쎈줈濡� �씠�룞 �썑 �긽�꽭 吏꾩엯�떆 議고쉶
+ function getDetailList(projectKey, number) {
+ var conditions = {
+ projectKey : projectKey,
+ combinationIssueNumber : number
+ };
+
+ Issue.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (result.data.data != null && result.data.data.length > 0) {
+ $scope.vm.projectKey = result.data.data[0].projectKey;
+ $scope.vm.issueNumber = result.data.data[0].issueNumber;
+ $scope.vm.responseData = result.data;
+
changeDetailView(result.data.data[0].id);
}
}
@@ -567,7 +631,7 @@
resolve : {
parameter : function () {
return {
- id : id
+ id : id,
};
}
}
@@ -658,7 +722,13 @@
size : "lg",
controller : 'issueAddTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.issueTypeId
+ };
+ }
+ }
});
}
@@ -704,6 +774,26 @@
}
else {
SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
+
+ return deferred.promise;
+ }
+
+ // �씠�뒋�쑀�삎 蹂� �뙆�듃�꼫 紐⑸줉
+ function getUsePartner() {
+ var deferred = $q.defer();
+ $scope.vm.partners = [];
+
+ Issue.findPartners($resourceProvider.getContent({},
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+ if (result.data.message.status === "success") {
+ $scope.vm.partnerVos = result.data.content;
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // �슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -774,6 +864,12 @@
angular.forEach(result.data.data, function (customField) {
switch (customField.customFieldType) {
case "INPUT" :
+ case "NUMBER" :
+ case "DATETIME" :
+ case "IP_ADDRESS" :
+ case "EMAIL" :
+ case "SITE" :
+ case "TEL" :
customField.useValues = "";
break;
@@ -781,6 +877,7 @@
case "SINGLE_SELECT" :
customField.useValues = [];
break;
+
}
$scope.vm.customFields.push(customField);
@@ -797,17 +894,24 @@
}
// �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
+
function getIssueTableConfigs() {
var deferred = $q.defer();
- IssueTableConfig.detail($resourceProvider.getContent({},
- $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- if (result.data.message.status !== "success") {
- SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
- }
+ if ($rootScope.issueTypeMenu != null){
+ var content = {
+ issueTypeId : $rootScope.issueTypeMenu.id
+ }
- deferred.resolve(result.data.data);
- });
+ 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;
}
@@ -817,8 +921,10 @@
// �뙆�씪誘명꽣 �씫湲�
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
- $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ // $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ getDetailList(params.projectKey, params.issueNumber);
$rootScope.previousGetParams = null;
+ // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
return;
}
@@ -867,7 +973,7 @@
display : true
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEETEAM",
+ key : "ASSIGNEE_TEAM",
width : "width-140-p",
position : 4,
display : true
@@ -884,6 +990,7 @@
$scope.fn.startExecute();
}
+
]);
}
);
--
Gitblit v1.8.0