From 9598f34d992709454febd868c81b832159edeba7 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 24 11월 2021 18:30:39 +0900
Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트]
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 16 +---
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 16 +---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 44 +++++---------
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 87 ++++++++++++++++++++++------
4 files changed, 95 insertions(+), 68 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 65f4db8..bb4a776 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -203,15 +203,6 @@
makeTag += "<span class=\"titlename cursor text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
break;
- // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
- case "REL_COMMON_PRIORITY" :
- makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityVo.name + "'></span>";
- break;
- // �뿰愿� �씠�뒋 以묒슂�룄
- case "REL_COMMON_SEVERITY" :
- makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.severityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityVo.name + "'></span>";
- break;
-
// �븯�쐞 �씠�뒋 �씠�룞(�젣紐�)
case "ISSUE_DOWN_MOVE" :
makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.id)\">" + scope.data.title + "</span></a>";
@@ -262,6 +253,74 @@
break;
+ // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+ case "REL_COMMON_PRIORITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityVo.name + "'></span>";
+ break;
+
+ // �뿰愿� �씠�뒋 以묒슂�룄
+ case "REL_COMMON_SEVERITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.severityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityVo.name + "'></span>";
+ break;
+
+ case "REL_REGISTER":
+ scope.data.registerVos = [scope.data.issueRelation.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
+ break;
+
+ break;
+
+ case "REL_ISSUE_DEPARTMENT" :
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='color: #000000'>";
+ angular.forEach(scope.data.issueRelation.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
+ // �뿰愿� �씠�뒋 紐⑸줉�뿉�꽌 湲곌컙 �몴�떆
+ case "REL_ISSUE_DUE_DATE" :
+ if (!$rootScope.isDefined(scope.data.issueRelation.startDate) && !$rootScope.isDefined(scope.data.issueRelation.completeDate)) {
+ makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
+ }
+ else {
+ makeTag += "<span>" + scope.data.issueRelation.startDate + " ~ " + scope.data.issueRelation.completeDate + "</span>";
+ }
+ break;
+
+ case "DOWN_COMMON_PRIORITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityVo.name + "'></span>";
+ break;
+
+ case "DOWN_COMMON_SEVERITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.severityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityVo.name + "'></span>";
+ break;
+
+ case "DOWN_ISSUE_DEPARTMENT" :
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='color: #000000'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
+ case "DOWN_REGISTER":
+ scope.data.registerVos = [scope.data.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
+ break;
+
+ case "DOWN_ISSUE_DUE_DATE" :
+ if (!$rootScope.isDefined(scope.data.startDate) && !$rootScope.isDefined(scope.data.completeDate)) {
+ makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
+ }
+ else {
+ makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
+ }
+ break;
case "COMMON_PRIORITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityName + "'></span>";
@@ -269,11 +328,6 @@
case "COMMON_SEVERITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
- break;
-
- case "REL_REGISTER":
- scope.data.registerVos = [scope.data.issueRelation.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
break;
case "ISSUE_DEPARTMENT" :
@@ -285,11 +339,6 @@
makeTag += "</div>";
makeTag += "</ul>";
break;
-
- // angular.forEach(scope.data.departmentVos, function (departments) {
- // makeTag += "<span>" + departments.departmentName + "</span>"
- // });
- // break;
case "ISSUE_USER" :
makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 6e0ef2e..eba9b44 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -36,34 +36,28 @@
position : 2,
display : false
}, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
- position : 3,
- display : false
- }, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-100-p",
- position : 4,
+ position : 3,
display : false
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 5,
+ position : 4,
display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
- position : 6,
+ position : 5,
display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 7,
+ position : 6,
display : false
}, {
}]
@@ -136,7 +130,7 @@
var deferred = $q.defer();
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
+ delValue : $scope.vm.issueDownTableConfigs.splice(6,1),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index a02727a..cd4a4b8 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -37,34 +37,28 @@
position : 2,
display : false
}, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-100-p",
- position : 3,
- display : false
- }, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-50-p",
- position : 4,
+ position : 3,
display : false
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-50-p",
- position : 5,
+ position : 4,
display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-100-p",
- position : 6,
+ position : 5,
display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 7,
+ position : 6,
display : false
}, {
}]
@@ -139,7 +133,7 @@
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueRelTableConfigs.splice(7,1),
+ delValue : $scope.vm.issueRelTableConfigs.splice(6,1),
issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 065b0f6..b827d70 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -209,6 +209,8 @@
// �뿰愿� �씠�뒋 而щ읆
switch(issueTableConfig.key) {
+
+ // �뿰愿� �씠�뒋 援щ텇
case "RELATION_ISSUE_TYPE" :
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
@@ -217,6 +219,7 @@
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
break;
+ // �뿰愿� �씠�뒋 �젣紐�
case "RELATION_ISSUE_TITLE" :
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueTitle")
@@ -243,23 +246,16 @@
.setDAlign("text-center")
.setDRenderer("REL_COMMON_SEVERITY"));
break;
- case "ISSUE_TYPE" : // �씠�뒋 ���엯
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.issueType")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDName("issueTypeName"));
- break;
- case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ case "ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
+ .setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �벑濡앹옄
+ case "REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
@@ -267,15 +263,15 @@
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
- case "PERIOD" : // 湲곌컙
+ case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
+ .setDRenderer("REL_ISSUE_DUE_DATE"));
break;
- case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ case "MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + issueTableConfig.width)
@@ -319,7 +315,8 @@
// �븯�쐞 �씠�뒋 而щ읆
switch(issueTableConfig.key) {
- case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
+ // �븯�쐞 �씠�뒋 �젣紐�
+ case "DOWN_ISSUE_TITLE" :
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
@@ -327,14 +324,14 @@
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_MOVE"));
break;
- case "PRIORITY" : // �슦�꽑�닚�쐞
+ case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDRenderer("DOWN_COMMON_PRIORITY"));
break;
case "SEVERITY" : // 以묒슂�룄
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -343,14 +340,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
- break;
- case "ISSUE_TYPE" : // �씠�뒋 ���엯
- $scope.vm.downTableConfigs.push($tableProvider.config()
- .setHName("issue.issueType")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDName("issueTypeName"));
+ .setDRenderer("DOWN_COMMON_SEVERITY"));
break;
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -358,7 +348,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
+ .setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
case "REGISTER" : // �벑濡앹옄
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -366,7 +356,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDRenderer("DOWN_REGISTER"));
break;
case "PERIOD" : // 湲곌컙
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -374,7 +364,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
+ .setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.downTableConfigs.push($tableProvider.config()
--
Gitblit v1.8.0