From 4d692a614bba9d8954cbbdad2d79424afaab0298 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 17:50:00 +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 | 336 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 229 insertions(+), 107 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index c763d1a..57f8369 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -51,11 +51,13 @@
$scope.fn.containsPartner = containsPartner;
$scope.fn.onActivate = onActivate;
$scope.fn.issueBack = issueBack;
+ $scope.fn.removeRelationIssue = removeRelationIssue;
+ $scope.fn.removeDownIssue = removeDownIssue;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {}; // �쁽�옱 �씠�뒋
$scope.vm.images = []; // 泥⑤��맂 �뙆�씪 以� �씠誘몄� �뙆�씪
- $scope.vm.activeTab = "ALL"; // �솢�룞 �궡�뿭 �꺆
+ $scope.vm.activeTab = "RECODE"; // �솢�룞 �궡�뿭 �꺆
// �씠�뒋 �긽�깭 蹂�寃� �몴�떆 �뿬遺�
$scope.vm.editor = {
issueStatus : false
@@ -110,7 +112,7 @@
$scope.vm.relTableConfigs = [];
// �뀒�씠釉� �씠踰ㅽ듃
$scope.relTableEvent = {
- removeRelationIssue : removeRelationIssue, // �뿰愿� �씪媛� �궘�젣
+ //removeRelationIssue : removeRelationIssue, // �뿰愿� �씪媛� �궘�젣
changeDetailView : changeDetailView
};
@@ -118,7 +120,7 @@
$scope.vm.downTableConfigs = [];
// �뀒�씠釉� �씠踰ㅽ듃
$scope.downTableEvent = {
- removeDownIssue : removeDownIssue, // �뿰愿� �씪媛� �궘�젣
+ //removeDownIssue : removeDownIssue, // �뿰愿� �씪媛� �궘�젣
changeDetailView : changeDetailView
};
@@ -126,13 +128,18 @@
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
//$rootScope.$broadcast("makeIssueSearch",issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
+
$scope.fn.onActivate();
}
// �긽�쐞 �씠�뒋 �겢由��떆 �긽�쐞 �씠�뒋濡� �씠�룞
function issueBack() {
- $rootScope.currentDetailIssueId = $scope.vm.viewer.parentIssueVo.id
- $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
+ var index = $scope.$parent.vm.issueIds.length -2;
+ if (index > -1) {
+ var preIssueId = $scope.$parent.vm.issueIds[index];
+ $scope.$parent.vm.issueIds.splice(index + 1, 1);
+ $scope.$parent.tableEvent.changeDetailView(preIssueId, true);
+ }
}
function onActivate() {
@@ -147,11 +154,42 @@
});
// �븯�쐞 �씠�뒋 �궘�젣
- function removeDownIssue(id) {
+ function removeDownIssue() {
+ var removeIds = [];
+ var removePermission = true;
+
+ angular.forEach($scope.vm.viewer.issueDownVos, function (data) {
+ if (data.checked && data.modifyPermissionCheck) {
+ removeIds.push(data.id);
+ }
+
+ if (data.checked && !data.modifyPermissionCheck) {
+ removePermission = false;
+ }
+ });
+
+ if (!removePermission) {
+ SweetAlert.swal({
+ html : true,
+ title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
+ text : $filter("translate")("project.notHaveDeletePermissionExistsProject"), // "�궘�젣 沅뚰븳�씠 �뾾�뒗 �봽濡쒖젥�듃媛� 議댁옱�빀�땲�떎."
+ type : "error"
+ });
+ return;
+ }
+
+ if (removeIds.length < 1) {
+ SweetAlert.swal({
+ title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+ text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+ type : "warning"
+ });
+ return;
+ }
// �궘�젣 �븣由�
SweetAlert.swal({
title : $filter("translate")("issue.downIssueRemove"), // �븯�쐞 �씠�뒋 �궘�젣
- text : $filter("translate")("issue.wantToDeleteSelectIssue"),
+ text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"),
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -167,7 +205,7 @@
$rootScope.spinner = true;
var contents = {
- id : id
+ ids : removeIds
};
Issue.modifyParentIssue($resourceProvider.getContent(
@@ -189,7 +227,38 @@
}
// �뿰愿� �씠�뒋 �궘�젣
- function removeRelationIssue(id) {
+ function removeRelationIssue() {
+ var removeIds = [];
+ var removePermission = true;
+
+ angular.forEach($scope.vm.viewer.issueRelationVos, function (data) {
+ if (data.checked && data.modifyPermissionCheck) {
+ removeIds.push(data.id);
+ }
+
+ if (data.checked && !data.modifyPermissionCheck) {
+ removePermission = false;
+ }
+ });
+
+ if (!removePermission) {
+ SweetAlert.swal({
+ html : true,
+ title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
+ text : $filter("translate")("issue.notHaveDeletePermissionExistsAnIssue"), // �궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋媛� 議댁옱�빀�땲�떎.
+ type : "error"
+ });
+ return;
+ }
+
+ if (removeIds.length < 1) {
+ SweetAlert.swal({
+ title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+ text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+ type : "warning"
+ });
+ return;
+ }
// �궘�젣 �븣由�
SweetAlert.swal({
title : $filter("translate")("issue.relationIssueRemove"), // �뿰愿� �씠�뒋 �궘�젣
@@ -209,7 +278,7 @@
$rootScope.spinner = true;
var contents = {
- id : id
+ removeIds : removeIds
};
IssueRelation.delete($resourceProvider.getContent(
@@ -236,7 +305,7 @@
}
function getDownIssueListCallBack(result) {
- $scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
+ $scope.vm.autoCompletePageDown.issue.totalPage = result.data.page.totalPage;
}
// �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -244,44 +313,43 @@
// �뿰愿� �씠�뒋 而щ읆
switch(Rel_issueTableConfig.key) {
-
- // �뿰愿� �씠�뒋 援щ텇
- case "RELATION_ISSUE_TYPE" :
+ case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.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")
.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")
.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")
.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")
.setDType("renderer")
@@ -290,7 +358,7 @@
.setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
+ case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
@@ -298,7 +366,7 @@
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
- case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
+ case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
@@ -306,12 +374,11 @@
.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"));
+ .setDAlign("text-center"));
break;
}
@@ -342,8 +409,7 @@
// �븯�쐞 �씠�뒋 而щ읆
switch(Down_issueTableConfig.key) {
- // �븯�쐞 �씠�뒋 �젣紐�
- case "DOWN_ISSUE_TITLE" :
+ case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
@@ -361,25 +427,23 @@
.setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
break;
- case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
+ case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
.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")
.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")
.setDType("renderer")
@@ -387,7 +451,7 @@
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �벑濡앹옄
+ case "DOWN_REGISTER" : // �벑濡앹옄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
@@ -395,7 +459,7 @@
.setDAlign("text-center")
.setDRenderer("DOWN_REGISTER"));
break;
- case "PERIOD" : // 湲곌컙
+ case "DOWN_PERIOD" : // 湲곌컙
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
@@ -403,12 +467,11 @@
.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"));
+ .setDAlign("text-center"));
break;
}
@@ -437,10 +500,14 @@
function makeRelTableConfigs() {
$scope.vm.relTableConfigs = [];
$scope.vm.relTableConfigs.push($tableProvider.config()
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"))
+ $scope.vm.relTableConfigs.push($tableProvider.config()
.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()
@@ -450,15 +517,16 @@
.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"))
-
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }*/
angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -472,22 +540,26 @@
function makeDownTableConfigs() {
$scope.vm.downTableConfigs = [];
$scope.vm.downTableConfigs.push($tableProvider.config()
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"))
+ $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"))
- if($scope.vm.viewer.modifyPermissionCheck){
+ /*if($scope.vm.viewer.modifyPermissionCheck){
$scope.vm.downTableConfigs.push($tableProvider.config()
.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"))
- }
+ }*/
angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
@@ -517,20 +589,24 @@
});
$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"))
+ .setHName("issue.relationIssueTitle")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-60-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_MOVE"))*/
$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"))
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"))
angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -539,14 +615,15 @@
}
});
- $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"))
-
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }*/
} else {
makeRelTableConfigs();
}
@@ -567,13 +644,17 @@
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"))*/
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"))
angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Down_issueTableConfig.display) {
@@ -581,14 +662,15 @@
$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"))
-
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_DOWN_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }*/
} else {
makeDownTableConfigs();
}
@@ -630,9 +712,14 @@
return;
}
+ var ids = [];
+ if ($scope.vm.form.issuesDown[0].id != null) {
+ ids.push($scope.vm.form.issuesDown[0].id);
+ }
+
var contents = {
issueId : $rootScope.currentDetailIssueId,
- id : $scope.vm.form.issuesDown[0].id,
+ ids : ids,
parentIssueId : $rootScope.currentDetailIssueId
};
@@ -710,6 +797,20 @@
}
function modifyDownIssueStatus() {
+ var issueIds = [];
+
+ angular.forEach($scope.vm.viewer.issueDownVos, function (data) {
+ if (data.checked) {
+ issueIds.push(data.id);
+ //$scope.vm.projectId = data.projectId;
+ }
+ });
+
+ if (issueIds.length < 1) {
+ SweetAlert.warning($filter("translate")("issue.selectionCheck"), $filter("translate")("issue.selectIssueToChangeStatus")); // �꽑�깮 ���긽 �솗�씤, �긽�깭 蹂�寃쏀븷 �씠�뒋瑜� �꽑�깮�븯�꽭�슂.
+ return;
+ }
+
$uibModal.open({
templateUrl : 'views/issue/downIssueModifyStatus.html',
size : "md",
@@ -720,7 +821,8 @@
return {
issueTypeId : $scope.vm.viewer.issueTypeVo.id,
issueIds : [$scope.vm.viewer.id],
- downIssues : $scope.vm.viewer.issueDownVos,
+ //downIssues : $scope.vm.viewer.issueDownVos,
+ downIssues : issueIds,
projectId : $scope.vm.viewer.projectVo.id
};
}
@@ -851,13 +953,12 @@
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
function getIssueDetail() {
+ $rootScope.spinner = true;
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
$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) {
@@ -896,6 +997,9 @@
issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
$scope.vm.form.issues.push(issueRelationVo.issueRelation);
});
+ result.data.data.issueRelationVos.sort(function (a, b) { //理쒓렐蹂�寃쎌씪 �궡由쇱감�닚
+ return a.modifyDate > b.modifyDate ? -1 : a.modifyDate < b.modifyDate ? 1 : 0;
+ });
}
// �븯�쐞 �씠�뒋 諛섎ぉ臾�
@@ -905,6 +1009,9 @@
$scope.vm.form.issuesDown.push(issueDownVo);
$scope.vm.form.issuesDownStatus.push(issueDownVo.issueStatusVo.issueStatusType);
});
+ result.data.data.issueDownVos.sort(function (a, b) { //理쒓렐蹂�寃쎌씪 �궡由쇱감�닚
+ return a.modifyDate > b.modifyDate ? -1 : a.modifyDate < b.modifyDate ? 1 : 0;
+ });
}
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
@@ -912,12 +1019,12 @@
if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
$rootScope.changeLastProject(result.data.data.projectVo.id);
}
-
}
}
else {
SweetAlert.swal($filter("translate")("issue.errorIssueDetails"), result.data.message.message, "error"); // �씠�뒋 �긽�꽭 �젙蹂� 議고쉶 �삤瑜�
}
+ $rootScope.spinner = false;
});
}
@@ -995,33 +1102,45 @@
// �솢�룞 �씠�젰 留뚮뱾湲�
function makeActiveHistory() {
+ $scope.vm.viewer.activeParentHistory = "";
+ $scope.vm.viewer.activeHistory = "";
if ($scope.vm.viewer.issueDownVos != null && $scope.vm.viewer.issueDownVos.length > 0) {
- $scope.vm.viewer.activeHistory = "";
- $scope.vm.viewer.activeParentHistory = "";
- $scope.vm.viewer.activeDownHistory = "";
- $scope.vm.viewer.activeDownAllHistory = "";
+ $scope.vm.viewer.activeDownHistory = ""; //�븯�쐞�씠�뒋 �엳�뒪�넗由щ쭔
+ $scope.vm.viewer.downComment = ""; //�븯�쐞�씠�뒋 �뙎湲�留�
+ $scope.vm.viewer.activeDownAllHistory = ""; //�븯�쐞�씠�뒋 �엳�뒪�넗由�+�뙎湲�
+ var downTitle = "";
+ var oriDownHistory = [];
+ var oriDownCommentHistory = [];
+
// �븯�쐞�씠�뒋 �엳�뒪�넗由�
for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
- $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
- i++;
+ oriDownHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos);
+ oriDownCommentHistory.push($scope.vm.viewer.issueDownVos[i].issueCommentVos);
}
+ for (var i=0; i<oriDownHistory.length; i++){
+ if ($scope.vm.viewer.activeDownHistory === "") {
+ $scope.vm.viewer.activeDownHistory = oriDownHistory[i];
+ } else {
+ $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.activeDownHistory.concat(oriDownHistory[i]);
+ }
+ }
+
for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
- $scope.vm.viewer.activeDownHistory[i].description
- = "<div class='dot'>�븯�쐞�씠�뒋 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>" + $scope.vm.viewer.activeDownHistory[i].description;
+ downTitle = "<div class='dot' style='margin-bottom: -8px'>*�븯�쐞�씠�뒋 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>";
+ $scope.vm.viewer.activeDownHistory[i].desc = downTitle + $scope.vm.viewer.activeDownHistory[i].description;
}
$scope.vm.viewer.activeDownHistory.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
});
// �븯�쐞�씠�뒋 �뙎湲� �엳�뒪�넗由�
- for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
- $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
- i++;
+ for (var i=0; i<oriDownCommentHistory.length; i++) {
+ if ($scope.vm.viewer.downComment === "") {
+ $scope.vm.viewer.downComment = oriDownCommentHistory[i];
+ } else {
+ $scope.vm.viewer.downComment = $scope.vm.viewer.downComment.concat(oriDownCommentHistory[i]);
+ }
}
- /*for (var i=0; i<$scope.vm.viewer.downComment.length; i++){
- $scope.vm.viewer.downComment[i].description
- = $scope.vm.viewer.downComment[i].title +"�쓽 �뙎湲� : "+ $scope.vm.viewer.downComment[i].description;
- }*/
$scope.vm.viewer.issueDownVos.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
});
@@ -1031,8 +1150,12 @@
$scope.vm.viewer.activeHistory = $scope.vm.viewer.activeParentHistory.concat($scope.vm.viewer.activeDownAllHistory);
}else {
+ $scope.vm.viewer.activeParentHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
$scope.vm.viewer.activeHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
}
+ $scope.vm.viewer.activeParentHistory.sort(function (a, b) { //�궡由쇱감�닚
+ return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
+ });
$scope.vm.viewer.activeHistory.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
});
@@ -1087,7 +1210,6 @@
$timeout(function () {
SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // �궘�젣 �꽦怨�
}, 100);
-
$scope.fn.getCommentList();
}
else {
--
Gitblit v1.8.0