From e0af96194a1fdc3c92d125f67370071b948dcde5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 22 11월 2021 18:29:55 +0900
Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트]
---
src/main/java/kr/wisestone/owl/domain/enumType/IssueModifyType.java | 3 +
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 2
src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 30 ++++++++++----
src/main/webapp/scripts/app/issue/issueList.controller.js | 19 +--------
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 26 ++++++++-----
5 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/enumType/IssueModifyType.java b/src/main/java/kr/wisestone/owl/domain/enumType/IssueModifyType.java
index 313997d..5d3027e 100644
--- a/src/main/java/kr/wisestone/owl/domain/enumType/IssueModifyType.java
+++ b/src/main/java/kr/wisestone/owl/domain/enumType/IssueModifyType.java
@@ -4,6 +4,9 @@
* Created by wisestone on 2018-10-10.
*/
public enum IssueModifyType {
+ RELATION_ISSUE_TYPE,
+ RELATION_ISSUE_TITLE,
+ DOWN_ISSUE_TITLE,
SEVERITY,
PRIORITY,
ISSUE_STATUS,
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index f022efe..a40e4b2 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -24,46 +24,52 @@
$scope.vm = {
issueId : "",
issueTableConfigs : [{
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
+ name : $filter("translate")("issue.downIssueTitle"), //
+ key : "DOWN_ISSUE_TITLE",
width : "width-100-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 : 2,
+ position : 3,
display : true
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-140-p",
- position : 3,
+ position : 4,
display : true
}, {
name : $filter("translate")("common.assignee"), // �떞�떦�옄
key : "ASSIGNEE",
width : "width-100-p",
- position : 4,
+ position : 5,
display : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 5,
+ position : 6,
display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
- position : 6,
+ position : 7,
display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 7,
+ position : 8,
display : false
}, {
}]
@@ -132,7 +138,7 @@
function getIssueTableConfigs() {
var deferred = $q.defer();
- IssueTableConfig.downDetail($resourceProvider.getContent({},
+ IssueTableConfig.downDetail($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); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
@@ -146,7 +152,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 8;
angular.forEach(result, function (customField) {
$scope.vm.issueTableConfigs.push({
name : customField.name,
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index c6ea68c..44826ba 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -132,7 +132,7 @@
function getIssueTableConfigs() {
var deferred = $q.defer();
- IssueTableConfig.relationDetail($resourceProvider.getContent({},
+ IssueTableConfig.relationDetail($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); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index 0e236a7..cdddd59 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -23,46 +23,58 @@
// 蹂��닔 紐⑥쓬
$scope.vm = {
issueTableConfigs : [{
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
+ name : $filter("translate")("issue.relationIssueType"), // �뿰愿� �씠�뒋 援щ텇
+ key : "RELATION_ISSUE_TYPE",
width : "width-100-p",
position : 1,
+ display : true
+ }, {
+ name : $filter("translate")("issue.relationIssueTitle"), // �뿰愿� �씠�뒋 �젣紐�
+ key : "RELATION_ISSUE_TITLE",
+ width : "width-80-p",
+ position : 2,
+ display : true
+ }, {
+ name : $filter("translate")("common.importance"), // �슦�꽑�닚�쐞
+ key : "PRIORITY",
+ width : "width-80-p",
+ position : 3,
display : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
key : "SEVERITY",
width : "width-80-p",
- position : 2,
+ position : 4,
display : true
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-140-p",
- position : 3,
+ position : 5,
display : true
}, {
name : $filter("translate")("common.assignee"), // �떞�떦�옄
key : "ASSIGNEE",
width : "width-100-p",
- position : 4,
+ position : 6,
display : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 5,
+ position : 7,
display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
- position : 6,
+ position : 8,
display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 7,
+ position : 9,
display : false
}, {
}]
@@ -144,7 +156,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 9;
angular.forEach(result, function (customField) {
$scope.vm.issueTableConfigs.push({
name : customField.name,
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 0be7e8d..3b68c16 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,12 +64,10 @@
responseData : {
data : []
},
- departmentName : "",
projectName : "", // �봽濡쒖젥�듃 寃��깋
userName : "", // �떞�떦�옄 寃��깋
registerName : "", // �벑濡앹옄 寃��깋
projects : [], // �봽濡쒖젥�듃
- departments : [],
issueStatuses : [], // �씠�뒋 �긽�깭
issueTypes : [], // �씠�뒋 �쑀�삎
priorities : [], // �슦�꽑 �닚�쐞
@@ -105,7 +103,6 @@
search : $scope.vm.search,
projects : $scope.vm.projects,
users : $scope.vm.users,
- departments : $scope.vm.departments,
registers : $scope.vm.registers,
parentIssueId : $scope.vm.parentIssueId
})
@@ -133,10 +130,9 @@
var issueListSearchObject = JSON.parse(result.data.data);
// �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
$scope.vm.search = issueListSearchObject.search;
- $scope.vm.users = issueListSearchObject.users;
- $scope.vm.departments = issueListSearchObject.departments;
+ /*$scope.vm.users = issueListSearchObject.users;
$scope.vm.projects = issueListSearchObject.projects;
- $scope.vm.registers = issueListSearchObject.registers;
+ $scope.vm.registers = issueListSearchObject.registers;*/
$scope.fn.getPageList(0, true);
} else {
@@ -380,15 +376,6 @@
});
return userIds;
- })(),
- departmentIds : (function () {
- var departmentIds = [];
-
- angular.forEach($scope.vm.departments, function (department) {
- departmentIds.push(department.id);
- });
-
- return departmentIds;
})(),
registerIds : (function () {
var registerIds = [];
--
Gitblit v1.8.0