From a61990a30a076c17d7beeeb5c8605b24b16b06fe Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 25 11월 2021 12:59:57 +0900
Subject: [PATCH] 이슈 상세 연관,하위 컬럼 수정 [프론트]
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 400 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 253 insertions(+), 147 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index de8343e..0e69b70 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -8,14 +8,15 @@
'angular'
],
function (app, angular) {
- app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'IssueStatus', 'IssueTableConfig', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, IssueStatus, IssueTableConfig, $filter) {
+ app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
+ '$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'IssueTableConfig', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
// IssueListController vm, fn 蹂��닔 �긽�냽.
$scope.fn.getIssueDetail = getIssueDetail; // �씠�뒋 �긽�꽭 �젙蹂� 媛��졇�삤湲�
$scope.fn.setRelTableColumn = setRelTableColumn;
- $scope.fn.setTableColumnDown = setTableColumnDown;
+ $scope.fn.setDownTableColumn = setDownTableColumn;
$scope.fn.addComment = addComment; // �뙎湲� �벑濡�
$scope.fn.removeComment = removeComment; // �뙎湲� �궘�젣
$scope.fn.getCommentList = getCommentList; // �뙎湲� 紐⑸줉 媛��졇�삤湲�
@@ -39,6 +40,7 @@
$scope.fn.addRelationIssueTableConfig = addRelationIssueTableConfig; // �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.addDownIssueTableConfig = addDownIssueTableConfig; // �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.getRelTableConfigs = getRelTableConfigs;
+ $scope.fn.getDownTableConfigs = getDownTableConfigs;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -111,11 +113,13 @@
$scope.$parent.tableEvent.changeDetailView(issue.id);
}
- // �븯�쐞 �씪媛� �궘�젣
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+ // �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue(id) {
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("issue.downIssueRemove"), // �뿰愿� �씪媛� �궘�젣
+ title : $filter("translate")("issue.downIssueRemove"), // �븯�쐞 �씠�뒋 �궘�젣
text : $filter("translate")("issue.wantToDeleteSelectIssue"),
type : "warning",
showCancelButton : true,
@@ -153,11 +157,11 @@
}
- // �뿰愿� �씪媛� �궘�젣
+ // �뿰愿� �씠�뒋 �궘�젣
function removeRelationIssue(id) {
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("issue.relationIssueRemove"), // �뿰愿� �씪媛� �궘�젣
+ title : $filter("translate")("issue.relationIssueRemove"), // �뿰愿� �씠�뒋 �궘�젣
text : $filter("translate")("issue.wantToDeleteSelectIssue"),
type : "warning",
showCancelButton : true,
@@ -201,10 +205,12 @@
}
// �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setRelTableColumn(issueTableConfig) {
+ function setRelTableColumn(Rel_issueTableConfig) {
- // �뿰愿� �씠�뒋 而щ읆
- switch(issueTableConfig.key) {
+ // �뿰愿� �씠�뒋 而щ읆
+ switch(Rel_issueTableConfig.key) {
+
+ // �뿰愿� �씠�뒋 援щ텇
case "RELATION_ISSUE_TYPE" :
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
@@ -213,6 +219,7 @@
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
break;
+ // �뿰愿� �씠�뒋 �젣紐�
case "RELATION_ISSUE_TITLE" :
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueTitle")
@@ -221,221 +228,238 @@
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
break;
- case "PRIORITY" : // �슦�꽑�닚�쐞
+ case "PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDRenderer("REL_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // 以묒슂�룄
+ case "SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.importance")
.setDName("severityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
+ .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)
+ .setHWidth("bold " + Rel_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")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDRenderer("REL_REGISTER"));
break;
- case "PERIOD" : // 湲곌컙
+ case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_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)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
break;
+ // default :"ISSUE_RELATION_DELETE" // �뿰愿� �궘�젣
+ // $scope.vm.relTableConfigs.push($tableProvider.config()
+ // .setHName("issue.downIssueTitle")
+ // .setDType("renderer")
+ // .setHWidth("bold" + issueTableConfig.width)
+ // .setHSort(false)
+ // .setDRenderer("ISSUE_RELATION_DELETE"));
+ // break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
+ if (Rel_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
- if (customField.id === Number(issueTableConfig.key.substring(13))) {
+ if (customField.id === Number(Rel_issueTableConfig.key.substring(13))) {
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDRenderer("REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
break;
}
}
}
}
- // �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙
- function makeTableConfigsDown() {
- $scope.vm.downTableConfigs = [];
- $scope.vm.downTableConfigs.push($tableProvider.config()
- .setHName("issue.downIssueTitle")
- .setDType("renderer")
- .setHWidth("width-60 bold")
- .setHSort(false)
- .setDRenderer("ISSUE_DOWN_MOVE"))
- $scope.vm.downTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueDelete")
- .setDType("renderer")
- .setHWidth("width-10 bold")
- .setDRenderer("ISSUE_DOWN_DELETE")
- .setHSort(false)
- .setDAlign("text-center"))
- angular.forEach($scope.vm.relTableConfigs, function (issueTableConfig) {
- // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
- // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setTableColumnDown(issueTableConfig);
- }
- });
- }
- // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setTableColumnDown(issueTableConfig) {
- if (issueTableConfig == null) return;
+ // �뀒�씠釉붿쓽 �븯�쐞 �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ function setDownTableColumn(Down_issueTableConfig) {
+ // if (issueTableConfig == null) return;
- // �씪諛� 而щ읆
- switch(issueTableConfig.key) {
- case "PRIORITY" : // �슦�꽑�닚�쐞
- $scope.vm.tableConfigs.push($tableProvider.config()
+ // �븯�쐞 �씠�뒋 而щ읆
+ switch(Down_issueTableConfig.key) {
+ // �븯�쐞 �씠�뒋 �젣紐�
+ case "DOWN_ISSUE_TITLE" :
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.downIssueTitle")
+ .setDType("renderer")
+ .setHWidth("bold " + Down_issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DOWN_MOVE"));
+ break;
+ case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDRenderer("DOWN_COMMON_PRIORITY"));
break;
case "SEVERITY" : // 以묒슂�룄
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.importance")
.setDName("severityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
- break;
- case "ISSUE_TYPE" : // �씠�뒋 ���엯
- $scope.vm.tableConfigs.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.tableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
+ .setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
case "REGISTER" : // �벑濡앹옄
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDRenderer("DOWN_REGISTER"));
break;
case "PERIOD" : // 湲곌컙
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
+ .setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") === -1) {
+ if (Down_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
- if (customField.id === Number(issueTableConfig.key.substring(13))) {
- $scope.vm.tableConfigs.push($tableProvider.config()
+ if (customField.id === Number(Down_issueTableConfig.key.substring(13))) {
+ $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDRenderer("DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
break;
}
}
}
}
+
// �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙
- function makeTableConfigs() {
+ function makeRelTableConfigs() {
$scope.vm.relTableConfigs = [];
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
.setDType("renderer")
- .setHWidth("width-30 bold")
+ .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")
- .setHWidth("width-60 bold")
+ .setDAlign("text-center")
+ .setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-20-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
- angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
+ if (Rel_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(issueTableConfig);
+ $scope.fn.setRelTableColumn(Rel_issueTableConfig);
}
});
}
+ // �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙
+ function makeDownTableConfigs() {
+ $scope.vm.downTableConfigs = [];
+ $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"))
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-20-p bold")
+ .setDRenderer("ISSUE_DOWN_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
+ // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ if (Down_issueTableConfig.display) {
+ // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ $scope.fn.setDownTableColumn(Down_issueTableConfig);
+ }
+ });
+ }
-
+ // �뿰愿� �씠�뒋 �긽�꽭 議고쉶
function getRelTableConfigs() {
var content = {
issueId : $scope.vm.viewer.id
@@ -451,22 +475,100 @@
// �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
if ($rootScope.isDefined(issueTableConfigs)) {
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
+
$scope.vm.issueRelTableConfigs = [];
$scope.vm.issueRelTableConfigs = JSON.parse(issueTableConfigs);
$scope.vm.issueRelTableConfigs.sort(function (a, b) {
return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
});
- angular.forEach($scope.vm.issueRelTableConfigs, function (issueTableConfig) {
+ $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.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 (issueTableConfig.display) {
+ if (Rel_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(issueTableConfig);
+ $scope.fn.setRelTableColumn(Rel_issueTableConfig);
+
}
});
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-20-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
} else {
- makeTableConfigs();
+ makeRelTableConfigs();
+ }
+
+ } else {
+ SweetAlert.swal($filter("translate")("issue.errorRemovableIssueStatusList"), result.data.message.message, "error"); // "�씠�룞 媛��뒫�븳 �씠�뒋 �긽�깭 紐⑸줉 議고쉶 �삤瑜�"
+ }
+ });
+ }
+
+ // �븯�쐞 �씠�뒋 �긽�꽭 議고쉶
+ function getDownTableConfigs() {
+ var content = {
+ issueId : $scope.vm.viewer.id
+ };
+
+ IssueTableConfig.downDetail($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ var issueTableConfigs = result.data.data;
+
+ // �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
+ if ($rootScope.isDefined(issueTableConfigs)) {
+ // �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
+ $scope.vm.issueDownTableConfigs = [];
+ $scope.vm.issueDownTableConfigs = JSON.parse(issueTableConfigs);
+ $scope.vm.issueDownTableConfigs.sort(function (a, b) {
+ return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
+ });
+ $scope.vm.downTableConfigs = [];
+ $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"))
+ angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
+ // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ if (Down_issueTableConfig.display) {
+ // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ $scope.fn.setDownTableColumn(Down_issueTableConfig);
+ }
+ });
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-20-p bold")
+ .setDRenderer("ISSUE_DOWN_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+
+ } else {
+ makeDownTableConfigs();
}
}
@@ -474,10 +576,38 @@
SweetAlert.swal($filter("translate")("issue.errorRemovableIssueStatusList"), result.data.message.message, "error"); // "�씠�룞 媛��뒫�븳 �씠�뒋 �긽�깭 紐⑸줉 議고쉶 �삤瑜�"
}
});
-
-
}
+
+
+
+ // �뿰愿� �씠�뒋 異붽�
+ function addRelationIssue() {
+ if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
+ || $scope.vm.issueName != $scope.vm.form.issues[0].title) {
+ SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
+ return;
+ }
+
+ var contents = {
+ relationIssueType : $scope.vm.relationIssueType.id,
+ issueId : $rootScope.currentDetailIssueId,
+ relationIssueId : $scope.vm.form.issues[0].id,
+ priorityName : $scope.vm.priorityName
+ };
+
+ IssueRelation.add($resourceProvider.getContent(
+ contents,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.getIssueDetail();
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
+ }
+ });
+ }
// �븯�쐞 �씠�뒋 異붽�
function addDownIssue() {
@@ -506,34 +636,11 @@
});
}
-
- // �뿰愿� �씠�뒋 異붽�
- function addRelationIssue() {
- if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
- || $scope.vm.issueName != $scope.vm.form.issues[0].title) {
- SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
- return;
- }
-
- var contents = {
- relationIssueType : $scope.vm.relationIssueType.id,
- issueId : $rootScope.currentDetailIssueId,
- relationIssueId : $scope.vm.form.issues[0].id
- };
-
- IssueRelation.add($resourceProvider.getContent(
- contents,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
-
- if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail();
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
- }
- });
- }
-
+ // �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
+ $rootScope.$on("getIssueDetail", function (event, args) {
+ $scope.vm.viewer.id = args["id"];
+ $scope.fn.getIssueDetail();
+ });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
$scope.$on("getIssueDetail", function (event, args) {
@@ -611,7 +718,7 @@
// �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addRelationIssueTableConfig() {
$uibModal.open({
- templateUrl : 'views/issue/issueRelationTableConfig.html',
+ templateUrl : 'views/issue/issueAddRelationTableConfig.html',
size : "lg",
controller : 'issueAddRelationTableConfigController',
backdrop : 'static',
@@ -622,7 +729,7 @@
// �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addDownIssueTableConfig() {
$uibModal.open({
- templateUrl : 'views/issue/issueDownTableConfig.html',
+ templateUrl : 'views/issue/issueAddDownTableConfig.html',
size : "lg",
controller : 'issueAddDownTableConfigController',
backdrop : 'static',
@@ -664,8 +771,9 @@
$scope.fn.initReload();
$scope.fn.getRelTableConfigs();
+ $scope.fn.getDownTableConfigs();
- Issue.detail($resourceProvider.getContent(
+ Issue.detail($resourceProvider.getContent(
{id : $scope.vm.viewer.id, deep : "02"},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
@@ -685,7 +793,6 @@
// �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎.
$scope.fn.setUseValueByIssueTypeCustomFields(result.data.data.issueCustomFieldValueVos);
-
// �뿰愿� �씪媛�
$scope.vm.issueName = "";
$scope.vm.form.issues = [];
@@ -693,16 +800,13 @@
$scope.vm.form.issuesDown = [];
$scope.vm.form.issuesDown.push(result.data.data);
- // makeTableConfigs();
- // $scope.vm.relTableConfigs = result.data.relTableConfigs;
-
+ // �뿰愿� �씠�뒋 諛섎났臾�
angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
$scope.vm.form.issues.push(issueRelationVo.issueRelation);
});
- // makeTableConfigsDown();
- // $scope.vm.downTableConfigs = result.data.downTableConfigs;
+ // �븯�쐞 �씠�뒋 諛섎ぉ臾�
angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
$scope.vm.form.issuesDown.push(issueDownVo.issue);
});
@@ -717,6 +821,8 @@
});
}
+ // ===================================================================================
+
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
function makePreviewImages(attachedFileVos) {
// 誘몃━蹂닿린 �씠誘몄� 珥덇린�솕
--
Gitblit v1.8.0