From 43e894fc3c8d5c9b80883985a125705a59aaf00e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:35 +0900
Subject: [PATCH] - 사용자정의필드 '필수데이터' UI 변경 - 이슈 목록에서 컬럼명 마우스 오버시 툴팁 나오도록 수정(tableConfig에 툴팁 설정)
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 291 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 174 insertions(+), 117 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 265a815..ccdf665 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -24,6 +24,7 @@
add : add, // �씠�뒋 �깮�꽦
modify : modify, // �씠�뒋 �닔�젙
addRelationIssueForm : addRelationIssueForm, // �뿰愿� �씠�뒋 異붽�
+ addDownIssueForm : addDownIssueForm, // �븯�쐞 �씠�뒋 異붽�
modifyMultiIssueStatus : modifyMultiIssueStatus, // �씠�뒋 �떎以� �긽�깭 蹂�寃�
removes : removes, // �씠�뒋 �궘�젣
addIssueTableConfig : addIssueTableConfig, // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -41,18 +42,21 @@
getIssueTableConfigs : getIssueTableConfigs, // �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
getResponseData : getResponseData, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- onClickListMode : onClickListMode // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
+ onClickListMode : onClickListMode, // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
+ setDefaultTableConfig : setDefaultTableConfig // 湲곕낯 �뀒�씠釉� �꽕�젙 �꽭�똿
};
// 蹂��닔
$scope.vm = {
+ projectId : "",
issueTypeId : "",
partnerVos : "",
search : {
- keyWord : "", // �쟾泥� 寃��깋
+ keyWord : "", // 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
+ issueNumber : "",
projectType : "BTS_PROJECT", // �봽濡쒖젥�듃 �쑀�삎
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
@@ -61,6 +65,9 @@
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
issueTypeIds : [] // �씠�뒋 �쑀�삎 寃��깋
+ },
+ searchAll : {
+ keyWord : "", // �쟾泥� 寃��깋
},
searchView : false, // �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
detailView : false, // �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -87,8 +94,10 @@
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false,
+ hideCompleteIssue : false,
+ hideDownIssue : true,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
};
@@ -99,10 +108,20 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$on("findIssueListOK", function (event, args) {
+ if (args != null) {
+ $scope.fn.startExecute();
+ }
+ });
+
// �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
$scope.$on("getIssueList", function () {
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
+
+ // �씠�뒋 紐⑸줉 �깉濡쒓퀬移�
+ $rootScope.$on("getIssueList", function (event, args) {})
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� 媛깆떊
$scope.$on("getIssueTableConfigs", function () {
@@ -111,6 +130,12 @@
$scope.$on("changedIssueListMenu", function (event, args) {
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
+ });
+
+ // �긽�떒 寃��깋�떆
+ $rootScope.$on("searchIssueList", function (event, args) {
+ $scope.vm.searchAll.keyWord = args.keyWord;
+ $scope.fn.getPageList(0);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -201,6 +226,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
+ $scope.vm.treeConfigs = [];
$scope.vm.tableConfigs.push($tableProvider.config()
.setDType("checkbox")
@@ -244,81 +270,44 @@
// �듃由� 而щ읆�쓣 留뚮뱾�뼱以��떎.
function setTreeColumn(issueTableConfig) {
-
// �씪諛� 而щ읆
switch(issueTableConfig.key) {
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("issue.issueTitle")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_TITLE"));
+ .setDName("title"));
break;
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.priority")
- .setDName("priorityName")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDName("priorityName"));
break;
case "SEVERITY" : // 以묒슂�룄
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.importance")
- .setDName("severityName")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
+ .setDName("severityName"));
break;
case "ISSUE_TYPE" : // �씠�뒋 ���엯
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("issue.issueType")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
.setDName("issueTypeName"));
break;
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.assigneeTeam")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
+ .setDName("assigneeTeam"));
break;
case "REGISTER" : // �벑濡앹옄
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.register")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDName("register"));
break;
case "PERIOD" : // 湲곌컙
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.period")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
+ .setDName("period"));
break;
case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
.setDName("modifyDate"));
break;
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.countDownIssue")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("DOWN_ISSUE_COUNT"));
+ .setDName("countDownIssue"));
break;
}
@@ -330,12 +319,9 @@
if (customField.id === Number(issueTableConfig.key.substring(13))) {
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName(customField.name)
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDType("CUSTOM_FIELD")
+ .setDName(customField.id)
+ .setColumnHint(customField));
break;
}
}
@@ -350,6 +336,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
+ .setDName("issueTitle")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -359,7 +346,7 @@
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("priority")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -368,22 +355,25 @@
case "SEVERITY" : // 以묒슂�룄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("severity")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("COMMON_SEVERITY"));
break;
- case "ISSUE_TYPE" : // �씠�뒋 ���엯
+ case "ISSUE_TYPE" : // �씠�뒋 �쑀�삎
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueType")
+ .setDName("issueType")
+ .setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDName("issueTypeName"));
+ .setDRenderer("COMMON_ISSUE_TYPE"));
break;
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -392,6 +382,7 @@
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("register")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -400,6 +391,7 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("period")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -415,9 +407,11 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
+ .setDName("countDownIssue")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
+ .setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
break;
}
@@ -432,6 +426,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("customFieldName" + [count])
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -463,6 +458,7 @@
keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
+ issueNumber : $scope.vm.search.issueNumber,
projectType : $scope.vm.search.projectType,
combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
beginRegisterDate : "",
@@ -471,7 +467,8 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
- hideIssue : $scope.vm.hideIssue,
+ hideCompleteIssue: $scope.vm.hideCompleteIssue,
+ hideDownIssue : $scope.vm.hideDownIssue,
isTree : $scope.vm.listMode === 1,
projectIds : (function () {
var projectIds = [];
@@ -598,13 +595,22 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false) {
+ function getPageList(selectedPage, detail = false, keyWord = "") {
+ $rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
}
- if ($scope.vm.hideIssue) {
- $scope.vm.hideIssue = true;
+ if (keyWord !== "") {
+ $scope.vm.search.keyWord = keyWord;
+ }
+
+ if ($scope.vm.hideCompleteIssue) {
+ $scope.vm.hideCompleteIssue = true;
+ }
+
+ if ($scope.vm.hideDownIssue) {
+ $scope.vm.hideDownIssue = true;
}
// �쁽�옱 �럹�씠吏� �젙蹂�
var currentPage = 0;
@@ -617,27 +623,31 @@
currentPage = selectedPage;
}
- // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
- 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
- });
- }
+ // 寃��깋 湲곕낯媛� �꽭�똿
+ $scope.vm.search.issueTypeIds = [];
+ $scope.vm.projects = [];
+ if ($scope.vm.searchAll.keyWord == null || $scope.vm.searchAll.keyWord === "") {
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
-
-
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- 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);
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey: $rootScope.issueTypeMenu.id,
+ fieldValue: $rootScope.issueTypeMenu.name
+ });
}
+
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
+
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
+ }
+ //$scope.vm.searchAll.keyWord = "";
}
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -647,6 +657,21 @@
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
+ 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++) {
+ /*if (result.data.data[i].parentIssueId != null) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
+ result.data.data.splice(i, 1);
+ i--;
+ }else*/
+ if ($scope.vm.search.issueTypeIds !== null && $scope.vm.search.issueTypeIds.length > 0
+ && result.data.data[i].issueTypeId !== $scope.vm.search.issueTypeIds[0].fieldKey) { //�씠�뒋���엯 泥댄겕
+ result.data.data.splice(i, 1);
+ i--;
+ }
+ }
+ }
+
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;
@@ -661,11 +686,11 @@
} else {
$scope.vm.responseData = result.data;
}
-
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
}
+ $rootScope.spinner = false; // �봽濡쒓렇�옒�뒪 諛�
});
}
@@ -745,6 +770,7 @@
angular.forEach($scope.vm.responseData.data, function (data) {
if (data.checked) {
issueIds.push(data.id);
+ $scope.vm.projectId = data.projectId;
}
});
@@ -761,7 +787,8 @@
resolve : {
parameter : function () {
return {
- issueIds : issueIds
+ issueIds : issueIds,
+ projectId : $scope.vm.projectId
};
}
}
@@ -790,6 +817,22 @@
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
controller : 'issueAddRelationController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ };
+ }
+ }
+ });
+ }
+
+ function addDownIssueForm(id) {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueAddDown.html',
+ size : "lg",
+ controller : 'issueAddDownController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -1178,16 +1221,55 @@
}
}
+ function setDefaultTableConfig() {
+ // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
+ $scope.vm.issueTableConfigs = [{
+ name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
+ key : "ISSUE_TITLE",
+ width : "width-140-p",
+ position : 1,
+ display : true
+ }, {
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
+ key : "PRIORITY",
+ width : "width-80-p",
+ position : 2,
+ display : true
+ }, {
+ name : $filter("translate")("common.importance"), // 以묒슂�룄
+ key : "SEVERITY",
+ width : "width-80-p",
+ position : 3,
+ display : true
+ }, {
+ name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
+ key : "ISSUE_TYPE",
+ width : "width-140-p",
+ position : 4,
+ display : true
+ }, {
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEE_TEAM",
+ width : "width-140-p",
+ position : 5,
+ display : true
+ }];
+ }
+
// 理쒖큹 �떎�뻾
function startExecute() {
// �뙆�씪誘명꽣 �씫湲�
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- getDetailList(params.projectKey, params.issueNumber);
- $rootScope.previousGetParams = null;
+ if (params.keyWord != null) {
+ $scope.vm.searchAll.keyWord = params.keyWord;
+ getPageList(0,false, params.keyWord);
+ }else {
+ getDetailList(params.projectKey, params.issueNumber);
+ return;
+ }
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
var promises = {
@@ -1214,38 +1296,7 @@
});
}
else {
- // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
- $scope.vm.issueTableConfigs = [{
- name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
- key : "ISSUE_TITLE",
- width : "width-140-p",
- position : 1,
- display : true
- }, {
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-80-p",
- position : 2,
- display : true
- }, {
- name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
- position : 3,
- display : true
- }, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
- position : 4,
- display : true
- }, {
- name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
- width : "width-140-p",
- position : 5,
- display : true
- }];
+ $scope.fn.setDefaultTableConfig();
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -1256,6 +1307,12 @@
});
}
+ // this.router.navigate(['path/to'])
+ // .then(() => {
+ // window.location.reload();
+ // });
+
+
$scope.fn.startExecute();
}
--
Gitblit v1.8.0