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 | 132 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 84bfa4e..57f8369 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -51,6 +51,8 @@
$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 = {}; // �쁽�옱 �씠�뒋
@@ -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
};
@@ -152,7 +154,38 @@
});
// �븯�쐞 �씠�뒋 �궘�젣
- 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"), // �븯�쐞 �씠�뒋 �궘�젣
@@ -172,7 +205,7 @@
$rootScope.spinner = true;
var contents = {
- id : id
+ ids : removeIds
};
Issue.modifyParentIssue($resourceProvider.getContent(
@@ -194,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"), // �뿰愿� �씠�뒋 �궘�젣
@@ -214,7 +278,7 @@
$rootScope.spinner = true;
var contents = {
- id : id
+ removeIds : removeIds
};
IssueRelation.delete($resourceProvider.getContent(
@@ -436,6 +500,10 @@
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")
@@ -449,7 +517,7 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
- if($scope.vm.viewer.modifyPermissionCheck) {
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
@@ -458,7 +526,7 @@
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
- }
+ }*/
angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -472,13 +540,17 @@
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")
@@ -487,7 +559,7 @@
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
- }
+ }*/
angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
@@ -531,6 +603,10 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))*/
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"))
angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -539,7 +615,7 @@
}
});
- if($scope.vm.viewer.modifyPermissionCheck) {
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
@@ -547,7 +623,7 @@
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
- }
+ }*/
} else {
makeRelTableConfigs();
}
@@ -575,6 +651,10 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.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) {
@@ -582,7 +662,7 @@
$scope.fn.setDownTableColumn(Down_issueTableConfig);
}
});
- if($scope.vm.viewer.modifyPermissionCheck) {
+ /*if($scope.vm.viewer.modifyPermissionCheck) {
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
@@ -590,7 +670,7 @@
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
- }
+ }*/
} else {
makeDownTableConfigs();
}
@@ -632,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
};
@@ -712,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",
@@ -722,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
};
}
--
Gitblit v1.8.0