From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 14:23:26 +0900
Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 15c8ac4..ff16c1d 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -61,6 +61,7 @@
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
completeDateRange : "", // �셿猷뚯씪 湲곌컙 寃��깋
+ dateRange : "", // 湲곌컙 寃��깋
severityIds : [], // 以묒슂�룄 寃��깋
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
@@ -337,7 +338,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueTitle")
+ .setDName("title")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -453,7 +454,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("useValue" + [count]) /* todo 泥댄겕*/
+ .setDName("useValue"+count) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -495,15 +496,18 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
+ dateRange: "",
hideCompleteIssue: $scope.vm.hideCompleteIssue,
hideDownIssue : $scope.vm.hideDownIssue,
isTree : $scope.vm.listMode === 1,
projectIds : (function () {
var projectIds = [];
- angular.forEach($scope.vm.projects, function (project) {
- projectIds.push(project.id);
- });
+ if (!$scope.vm.allIssue) { //�쟾泥� �궎�썙�뱶 寃��깋�씠 �븘�땺 寃쎌슦�뿉留� �봽濡쒖젥�듃ID push
+ angular.forEach($scope.vm.projects, function (project) {
+ projectIds.push(project.id);
+ });
+ }
return projectIds;
})(),
@@ -519,9 +523,11 @@
issueTypeIds : (function () {
var issueTypeIds = [];
- angular.forEach($scope.vm.search.issueTypeIds, function (issueTypeId) {
- issueTypeIds.push(issueTypeId.fieldKey);
- });
+ if (!$scope.vm.allIssue) { //�쟾泥� �궎�썙�뱶 寃��깋�씠 �븘�땺 寃쎌슦�뿉留� �씠�뒋�쑀�삎ID push
+ angular.forEach($scope.vm.search.issueTypeIds, function (issueTypeId) {
+ issueTypeIds.push(issueTypeId.fieldKey);
+ });
+ }
return issueTypeIds;
})(),
@@ -614,6 +620,10 @@
conditions.beginCompleteDate = completeDateRange[0].trim();
conditions.endCompleteDate = completeDateRange[1].trim();
}
+ // 湲곌컙
+ if ($rootScope.isDefined($scope.vm.search.dateRange)) {
+ conditions.dateRange = $scope.vm.search.dateRange.trim();
+ }
return conditions;
@@ -637,7 +647,7 @@
if (keyWord != null) {
$scope.vm.search.keyWord = keyWord;
$rootScope.isMainSearch = true;
-
+ $scope.vm.allIssue = true;
$rootScope.$broadcast("getPageListKeyWord", {keyWord: $scope.vm.search.keyWord});
}
@@ -662,10 +672,10 @@
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
- if (keyWord == null || keyWord === '') {
+ if (!$scope.vm.allIssue && keyWord == null || keyWord === '') {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
- //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
$scope.vm.search.issueTypeIds.push({
fieldKey: $rootScope.issueTypeMenu.id,
@@ -838,7 +848,7 @@
}
// �씠�뒋 �닔�젙 �뙘�뾽 �샇異�
- function modify(id) {
+ function modify(id, downTotalCount) {
$uibModal.open({
templateUrl : 'views/issue/issueModify.html',
size : "lg",
@@ -848,13 +858,17 @@
parameter : function () {
return {
id : id,
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id,
+ inheritPartners : $scope.vm.viewer.issueTypeVo.inheritPartners,
+ usePartner : $scope.vm.viewer.usePartnerVos,
+ downTotalCount : downTotalCount
};
}
}
});
}
- function addRelationIssueForm(id) {
+ function addRelationIssueForm(id, project, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
@@ -864,13 +878,15 @@
parameter : function () {
return {
id : id,
+ project : project,
+ issueTypeId : issueTypeId
};
}
}
});
}
- function addDownIssueForm(id) {
+ function addDownIssueForm(id, project, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddDown.html',
size : "lg",
@@ -880,6 +896,8 @@
parameter : function () {
return {
id : id,
+ project : project,
+ issueTypeId : issueTypeId
};
}
}
@@ -1059,7 +1077,8 @@
resolve : {
parameter : function () {
return {
- issueTypeId : $scope.vm.issueTypeId
+ issueTypeId : $scope.vm.issueTypeId,
+ allIssue : $scope.vm.allIssue
};
}
}
@@ -1235,7 +1254,15 @@
var deferred = $q.defer();
var content = {
- issueTypeId : $rootScope.getCurrentIssueTypeId()
+ issueTypeId : (function () {
+ var id = "";
+ if ($rootScope.allIssueList) {
+ id = -1;
+ } else {
+ id = $rootScope.getCurrentIssueTypeId();
+ }
+ return id;
+ })()
}
IssueTableConfig.detail($resourceProvider.getContent(content,
@@ -1346,7 +1373,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
$scope.vm.issueTableConfigs = JSON.parse(issueTableConfigs);
$scope.vm.issueTableConfigs.sort(function (a, b) {
- return a.position < b.position ? -1 : a.position > b.position ? 1: 0;
+ return parseInt(a.position) < parseInt(b.position) ? -1 : parseInt(a.position) > parseInt(b.position) ? 1 : 0;
});
}
else {
--
Gitblit v1.8.0