From 4ca3a63a192a8a2a03f287ee406780b78f359b89 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 14:03:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 109 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 48 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 674cceb..3423551 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -244,73 +244,80 @@
// �뿰愿� �씠�뒋 而щ읆
switch(Rel_issueTableConfig.key) {
- // �뿰愿� �씠�뒋 援щ텇
- case "RELATION_ISSUE_TYPE" :
+ case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
+ .setDName("relationIssueType")
.setDType("renderer")
- .setHWidth("width-30 bold")
- .setHSort(false)
+ .setDAlign("text-center")
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_TYPE"))
+ /*.setHWidth("width-30 bold")*/
+ /*.setHSort(false)*/
break;
- // �뿰愿� �씠�뒋 �젣紐�
- case "RELATION_ISSUE_TITLE" :
+ case "RELATION_ISSUE_TITLE" : // �뿰愿� �씠�뒋 �젣紐�
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueTitle")
+ .setDName("relationIssueTitle")
.setDType("renderer")
- .setHWidth("width-60 bold")
- .setHSort(false)
+ .setDAlign("text-center")
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_MOVE"))
+ /*.setHWidth("width-60 bold")*/
+ /*.setHSort(true)*/
break;
- case "PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+ case "RELATION_PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("relPriority")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
+ case "RELATION_SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("relSeverity")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_SEVERITY"));
break;
- case "ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
+ case "RELATION_ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("relAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
+ case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("relRegister")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
- case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
+ case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("relPeriod")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DUE_DATE"));
break;
- case "MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
+ case "RELATION_MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
- .setDName("modifyDate"));
+ .setDName("relModifyDate"));
break;
}
@@ -324,6 +331,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("relCustomFieldName" + [count])
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -341,10 +349,10 @@
// �븯�쐞 �씠�뒋 而щ읆
switch(Down_issueTableConfig.key) {
- // �븯�쐞 �씠�뒋 �젣紐�
- case "DOWN_ISSUE_TITLE" :
+ case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
+ .setDName("downIssueTitle")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -354,60 +362,64 @@
case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.issueStatus")
+ .setDName("downIssueStatus")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
break;
- case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
+ case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("downPriority")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // 以묒슂�룄
+ case "DOWN_SEVERITY" : // 以묒슂�룄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("downSeverity")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_SEVERITY"));
break;
- case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ case "DOWN_ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("downAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �벑濡앹옄
+ case "DOWN_REGISTER" : // �벑濡앹옄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("downRegister")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_REGISTER"));
break;
- case "PERIOD" : // 湲곌컙
+ case "DOWN_PERIOD" : // 湲곌컙
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("downPeriod")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
- case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ case "DOWN_MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDName("modifyDate"));
+ .setDName("downModifyDate"));
break;
}
@@ -421,6 +433,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("downCustomFieldName" + [count])
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -439,7 +452,7 @@
.setHName("issue.relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-30-p bold")
+ .setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -453,7 +466,7 @@
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -482,7 +495,7 @@
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -516,20 +529,20 @@
});
$scope.vm.relTableConfigs = [];
+ /* $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueType")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-30-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_TYPE"))
$scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueType")
- .setDType("renderer")
- .setDAlign("text-center")
- .setHWidth("width-30-p bold")
- .setHSort(false)
- .setDRenderer("ISSUE_RELATION_TYPE"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueTitle")
- .setDType("renderer")
- .setDAlign("text-center")
- .setHWidth("width-60-p bold")
- .setHSort(false)
- .setDRenderer("ISSUE_RELATION_MOVE"))
+ .setHName("issue.relationIssueTitle")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-60-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_MOVE"))*/
angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -541,7 +554,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -566,13 +579,13 @@
return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
});
$scope.vm.downTableConfigs = [];
- $scope.vm.downTableConfigs.push($tableProvider.config()
+/* $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
- .setDRenderer("ISSUE_DOWN_MOVE"))
+ .setDRenderer("ISSUE_DOWN_MOVE"))*/
angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Down_issueTableConfig.display) {
@@ -583,7 +596,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
--
Gitblit v1.8.0