From 13df3419f367b1448a844120840459a17df02f3a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 11:17:02 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 7193801..5ce58c6 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -24,6 +24,7 @@
add : add, // �씠�뒋 �깮�꽦
modify : modify, // �씠�뒋 �닔�젙
addRelationIssueForm : addRelationIssueForm, // �뿰愿� �씠�뒋 異붽�
+ addDownIssueForm : addDownIssueForm, // �븯�쐞 �씠�뒋 異붽�
modifyMultiIssueStatus : modifyMultiIssueStatus, // �씠�뒋 �떎以� �긽�깭 蹂�寃�
removes : removes, // �씠�뒋 �궘�젣
addIssueTableConfig : addIssueTableConfig, // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -47,6 +48,7 @@
// 蹂��닔
$scope.vm = {
+ projectId : "",
issueTypeId : "",
partnerVos : "",
search : {
@@ -90,7 +92,8 @@
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false,
+ hideCompleteIssue : false,
+ hideDownIssue : true,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
};
@@ -101,10 +104,20 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$on("findIssueListOK", function (event, args) {
+ if (args != null) {
+ $scope.fn.startExecute();
+ }
+ });
+
// �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
$scope.$on("getIssueList", function () {
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
+
+ // �씠�뒋 紐⑸줉 �깉濡쒓퀬移�
+ $rootScope.$on("getIssueList", function (event, args) {})
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� 媛깆떊
$scope.$on("getIssueTableConfigs", function () {
@@ -119,7 +132,6 @@
$scope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
- $rootScope.isMainSearch = false;
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -320,6 +332,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
+ .setDName("issueTitle")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -329,7 +342,7 @@
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("priority")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -338,22 +351,25 @@
case "SEVERITY" : // 以묒슂�룄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("severity")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("COMMON_SEVERITY"));
break;
- case "ISSUE_TYPE" : // �씠�뒋 ���엯
+ case "ISSUE_TYPE" : // �씠�뒋 �쑀�삎
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueType")
+ .setDName("issueType")
+ .setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDName("issueTypeName"));
+ .setDRenderer("COMMON_ISSUE_TYPE"));
break;
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -362,6 +378,7 @@
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("register")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -370,6 +387,7 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("period")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -385,6 +403,7 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
+ .setDName("countDownIssue")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -402,6 +421,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("customFieldName" + [count])
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -441,7 +461,8 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
- hideIssue : $scope.vm.hideIssue,
+ hideCompleteIssue: $scope.vm.hideCompleteIssue,
+ hideDownIssue : $scope.vm.hideDownIssue,
isTree : $scope.vm.listMode === 1,
projectIds : (function () {
var projectIds = [];
@@ -574,8 +595,12 @@
selectedPage = 0;
}
- if ($scope.vm.hideIssue) {
- $scope.vm.hideIssue = true;
+ if ($scope.vm.hideCompleteIssue) {
+ $scope.vm.hideCompleteIssue = true;
+ }
+
+ if ($scope.vm.hideDownIssue) {
+ $scope.vm.hideDownIssue = true;
}
// �쁽�옱 �럹�씠吏� �젙蹂�
var currentPage = 0;
@@ -588,15 +613,13 @@
currentPage = selectedPage;
}
-
-
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
if (!$rootScope.isMainSearch) {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
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,
@@ -624,12 +647,16 @@
if (result.data.message.status === "success") {
if (result.data.data != null && result.data.data.length > 0) {
+ //var resultSize = result.data.data.length;
for (var i = 0; i < result.data.data.length; i++) {
- if (result.data.data[i].parentIssueId != null) {
+ /*if (result.data.data[i].parentIssueId != null) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
result.data.data.splice(i, 1);
- }else if ($scope.vm.search.issueTypeIds !== null && $scope.vm.search.issueTypeIds.length > 0
- && result.data.data[i].issueTypeId !== $scope.vm.search.issueTypeIds[0].fieldKey) {
+ i--;
+ }else*/
+ if ($scope.vm.search.issueTypeIds !== null && $scope.vm.search.issueTypeIds.length > 0
+ && result.data.data[i].issueTypeId !== $scope.vm.search.issueTypeIds[0].fieldKey) { //�씠�뒋���엯 泥댄겕
result.data.data.splice(i, 1);
+ i--;
}
}
}
@@ -733,6 +760,7 @@
angular.forEach($scope.vm.responseData.data, function (data) {
if (data.checked) {
issueIds.push(data.id);
+ $scope.vm.projectId = data.projectId;
}
});
@@ -749,7 +777,8 @@
resolve : {
parameter : function () {
return {
- issueIds : issueIds
+ issueIds : issueIds,
+ projectId : $scope.vm.projectId
};
}
}
@@ -778,6 +807,22 @@
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
controller : 'issueAddRelationController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ };
+ }
+ }
+ });
+ }
+
+ function addDownIssueForm(id) {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueAddDown.html',
+ size : "lg",
+ controller : 'issueAddDownController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -1248,6 +1293,12 @@
});
}
+ // this.router.navigate(['path/to'])
+ // .then(() => {
+ // window.location.reload();
+ // });
+
+
$scope.fn.startExecute();
}
--
Gitblit v1.8.0