From 726b916d69be892a576ca5fba5d0334de1d8a6eb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 17:38:53 +0900
Subject: [PATCH] 연관이슈, 하위이슈 정보 추가 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 431 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 271 insertions(+), 160 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..073e2ca 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -8,14 +8,14 @@
'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','SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'IssueStatus', 'IssueTableConfig', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, 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 +39,7 @@
$scope.fn.addRelationIssueTableConfig = addRelationIssueTableConfig; // �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.addDownIssueTableConfig = addDownIssueTableConfig; // �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.getRelTableConfigs = getRelTableConfigs;
+ $scope.fn.getDownTableConfigs = getDownTableConfigs;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -111,11 +112,11 @@
$scope.$parent.tableEvent.changeDetailView(issue.id);
}
- // �븯�쐞 �씪媛� �궘�젣
+ // �븯�쐞 �씠�뒋 �궘�젣
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 +154,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,
@@ -203,7 +204,7 @@
// �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
function setRelTableColumn(issueTableConfig) {
- // �뿰愿� �씠�뒋 而щ읆
+ // �뿰愿� �씠�뒋 而щ읆
switch(issueTableConfig.key) {
case "RELATION_ISSUE_TYPE" :
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -277,119 +278,18 @@
.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) {
- // 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
- for (var count in $scope.vm.customFields) {
- var customField = $scope.vm.customFields[count];
-
- if (customField.id === Number(issueTableConfig.key.substring(13))) {
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName(customField.name)
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setColumnHint(customField)
- .setDRenderer("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;
-
- // �씪諛� 而щ읆
- switch(issueTableConfig.key) {
- case "PRIORITY" : // �슦�꽑�닚�쐞
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.priority")
- .setDName("priorityName")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
- break;
- case "SEVERITY" : // 以묒슂�룄
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.importance")
- .setDName("severityName")
- .setDType("renderer")
- .setHWidth("bold " + 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"));
- break;
- case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.assigneeTeam")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
- break;
- case "REGISTER" : // �벑濡앹옄
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.register")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("REGISTER"));
- break;
- case "PERIOD" : // 湲곌컙
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.period")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
- break;
- case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDName("modifyDate"));
- break;
- }
-
- // �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") === -1) {
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
@@ -408,23 +308,124 @@
}
}
+
+ // �뀒�씠釉붿쓽 �븯�쐞 �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ function setDownTableColumn(issueTableConfig) {
+ // if (issueTableConfig == null) return;
+
+ // �븯�쐞 �씠�뒋 而щ읆
+ switch(issueTableConfig.key) {
+ case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.downIssueTitle")
+ .setDType("renderer")
+ .setHWidth("bold " + 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)
+ .setDAlign("text-center")
+ .setDRenderer("COMMON_PRIORITY"));
+ break;
+ case "SEVERITY" : // 以묒슂�룄
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("common.importance")
+ .setDName("severityName")
+ .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"));
+ break;
+ case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("common.assigneeTeam")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DEPARTMENT"));
+ break;
+ case "REGISTER" : // �벑濡앹옄
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("common.register")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("REGISTER"));
+ break;
+ case "PERIOD" : // 湲곌컙
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("common.period")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DUE_DATE"));
+ break;
+ case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("common.lastChangeDate")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("modifyDate"));
+ break;
+ }
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
+ if (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.downTableConfigs.push($tableProvider.config()
+ .setHName(customField.name)
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setColumnHint(customField)
+ .setDRenderer("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")
+ .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")
+ .setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
+ $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"))
- angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.relTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -433,9 +434,33 @@
});
}
+ // �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙
+ function makeDownTableConfigs() {
+ $scope.vm.downTableConfigs = [];
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.downIssueTitle")
+ .setDType("renderer")
+ .setHWidth("width-60-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_DOWN_MOVE"))
+ $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"))
+ angular.forEach($scope.vm.downTableConfigs, function (issueTableConfig) {
+ // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ if (issueTableConfig.display) {
+ // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ $scope.fn.setDownTableColumn(issueTableConfig);
+ }
+ });
+ }
-
+ // �뿰愿� �씠�뒋 �긽�꽭 議고쉶
function getRelTableConfigs() {
var content = {
issueId : $scope.vm.viewer.id
@@ -451,22 +476,97 @@
// �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
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;
});
+ $scope.vm.relTableConfigs = [];
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueType")
+ .setDType("renderer")
+ .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-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_MOVE"))
angular.forEach($scope.vm.issueRelTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
$scope.fn.setRelTableColumn(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")
+ .setHWidth("width-60-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_DOWN_MOVE"))
+ angular.forEach($scope.vm.issueDownTableConfigs, function (issueTableConfig) {
+ // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ if (issueTableConfig.display) {
+ // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ $scope.fn.setDownTableColumn(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 +574,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 +634,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 +716,7 @@
// �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addRelationIssueTableConfig() {
$uibModal.open({
- templateUrl : 'views/issue/issueRelationTableConfig.html',
+ templateUrl : 'views/issue/issueAddRelationTableConfig.html',
size : "lg",
controller : 'issueAddRelationTableConfigController',
backdrop : 'static',
@@ -622,7 +727,7 @@
// �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addDownIssueTableConfig() {
$uibModal.open({
- templateUrl : 'views/issue/issueDownTableConfig.html',
+ templateUrl : 'views/issue/issueAddDownTableConfig.html',
size : "lg",
controller : 'issueAddDownTableConfigController',
backdrop : 'static',
@@ -664,6 +769,7 @@
$scope.fn.initReload();
$scope.fn.getRelTableConfigs();
+ $scope.fn.getDownTableConfigs();
Issue.detail($resourceProvider.getContent(
{id : $scope.vm.viewer.id, deep : "02"},
@@ -693,18 +799,21 @@
$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);
+ });
+
+ // wyu
+ angular.forEach(result.data.data.issueRelationVos, function (issueRelationColum){
+ issueRelationColum.issueRelation = $scope.vm.issueRelation;
+ $scope.vm.form.issues.push(issueRelationColum.issueRelation);
});
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
@@ -717,6 +826,8 @@
});
}
+ // ===================================================================================
+
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
function makePreviewImages(attachedFileVos) {
// 誘몃━蹂닿린 �씠誘몄� 珥덇린�솕
--
Gitblit v1.8.0