From 875d386d01ea72451788eef95067fb5e6de3983d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 22 11월 2021 16:05:03 +0900
Subject: [PATCH] 이슈 테이블 표시 설정 추가 완료(백엔드)
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 09e5b4e..0be7e8d 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,7 +52,7 @@
severityIds : [], // 以묒슂�룄 寃��깋
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
- issueTypeIds : [] // �씠�뒋 �쑀�삎 寃��깋
+ issueTypeIds : [], // �씠�뒋 �쑀�삎 寃��깋
},
searchView : false, // �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
detailView : false, // �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -64,10 +64,12 @@
responseData : {
data : []
},
+ departmentName : "",
projectName : "", // �봽濡쒖젥�듃 寃��깋
userName : "", // �떞�떦�옄 寃��깋
registerName : "", // �벑濡앹옄 寃��깋
projects : [], // �봽濡쒖젥�듃
+ departments : [],
issueStatuses : [], // �씠�뒋 �긽�깭
issueTypes : [], // �씠�뒋 �쑀�삎
priorities : [], // �슦�꽑 �닚�쐞
@@ -75,7 +77,8 @@
users : [], // �떞�떦�옄
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
- issueTableConfigs : [] // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ parentIssueId : ""
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -102,7 +105,9 @@
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
})
};
@@ -120,6 +125,7 @@
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
function getVmSearchObject() {
+
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
@@ -127,9 +133,10 @@
var issueListSearchObject = JSON.parse(result.data.data);
// �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
$scope.vm.search = issueListSearchObject.search;
- /*$scope.vm.users = issueListSearchObject.users;
+ $scope.vm.users = issueListSearchObject.users;
+ $scope.vm.departments = issueListSearchObject.departments;
$scope.vm.projects = issueListSearchObject.projects;
- $scope.vm.registers = issueListSearchObject.registers;*/
+ $scope.vm.registers = issueListSearchObject.registers;
$scope.fn.getPageList(0, true);
} else {
@@ -239,9 +246,9 @@
.setDAlign("text-center")
.setDName("issueTypeName"));
break;
- case "ASSIGNEE" : // �떞�떦�옄
+ case "ASSIGNEETEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.assignee")
+ .setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -374,6 +381,15 @@
return userIds;
})(),
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+
+ return departmentIds;
+ })(),
registerIds : (function () {
var registerIds = [];
@@ -447,6 +463,14 @@
currentPage = selectedPage;
}
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey : $rootScope.issueTypeMenu.id,
+ fieldValue : $rootScope.issueTypeMenu.name
+ });
+ }
// 寃��깋 議곌굔�쓣 ���옣�븳�떎.
//$scope.fn.makeVmSearchObject();
@@ -857,8 +881,8 @@
position : 3,
display : true
}, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEETEAM",
width : "width-140-p",
position : 4,
display : true
--
Gitblit v1.8.0