From 30c4906a7f2db197074c268c0989200e74b4b367 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 토, 19 2월 2022 18:06:32 +0900
Subject: [PATCH] - 사용자정의필드 컬럼 정렬 진행중
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 472 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 366 insertions(+), 106 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 7cbdfe6..2e7dc86 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -8,9 +8,9 @@
'angular'
],
function (app, angular) {
- app.controller('issueListController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
+ app.controller('issueListController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$treeProvider', '$state', '$uibModal', '$q',
'$controller', '$injector', 'SweetAlert', 'Issue', 'IssueType', 'Priority', 'Severity', 'IssueStatus', 'CustomField', 'IssueSearch', 'IssueTableConfig', '$timeout', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, Issue, IssueType, Priority, Severity, IssueStatus, CustomField,
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $treeProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, Issue, IssueType, Priority, Severity, IssueStatus, CustomField,
IssueSearch, IssueTableConfig, $timeout, $filter) {
// �븿�닔
@@ -20,9 +20,11 @@
changePageRowCount : changePageRowCount, // �럹�씠吏� 蹂�寃�
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
setTableColumn : setTableColumn, // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ setTreeColumn : setTreeColumn,
add : add, // �씠�뒋 �깮�꽦
modify : modify, // �씠�뒋 �닔�젙
addRelationIssueForm : addRelationIssueForm, // �뿰愿� �씠�뒋 異붽�
+ addDownIssueForm : addDownIssueForm, // �븯�쐞 �씠�뒋 異붽�
modifyMultiIssueStatus : modifyMultiIssueStatus, // �씠�뒋 �떎以� �긽�깭 蹂�寃�
removes : removes, // �씠�뒋 �궘�젣
addIssueTableConfig : addIssueTableConfig, // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -39,22 +41,27 @@
makeSearchConditions : makeSearchConditions, // 寃��깋 議곌굔�쓣 留뚮뱺�떎.
getIssueTableConfigs : getIssueTableConfigs, // �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- getResponseData : getResponseData // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ getResponseData : getResponseData, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ onClickListMode : onClickListMode, // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
+ setDefaultTableConfig : setDefaultTableConfig // 湲곕낯 �뀒�씠釉� �꽕�젙 �꽭�똿
};
// 蹂��닔
$scope.vm = {
+ projectId : "",
issueTypeId : "",
partnerVos : "",
search : {
- keyWord : "", // �쟾泥� 寃��깋
+ keyWord : "", // 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
+ issueNumber : "",
projectType : "BTS_PROJECT", // �봽濡쒖젥�듃 �쑀�삎
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
completeDateRange : "", // �셿猷뚯씪 湲곌컙 寃��깋
+ dateRange : "", // 湲곌컙 寃��깋
severityIds : [], // 以묒슂�룄 寃��깋
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
@@ -66,7 +73,9 @@
selectedPage : 0,
selectedPageRowCount : String(10)
},
+
tableConfigs : [], // �뀒�씠釉� �뀑�똿 �젙蹂�
+ treeConfigs : [], // �듃由� �뀑�똿 �젙蹂�
responseData : {
data : []
},
@@ -84,8 +93,12 @@
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false
+ hideCompleteIssue : false,
+ hideDownIssue : true,
+ listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
+ allIssue : false
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -95,10 +108,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 () {
@@ -106,7 +129,9 @@
});
$scope.$on("changedIssueListMenu", function (event, args) {
- $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
+ $scope.vm.search.keyWord = "";
+ $rootScope.isMainSearch = false;
+ //$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -136,7 +161,7 @@
}
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
- function getVmSearchObject() {
+ function getVmSearchObject(keyWord = null, allIssue = false) {
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -150,9 +175,9 @@
// $scope.vm.projects = issueListSearchObject.projects;
// $scope.vm.registers = issueListSearchObject.registers;
- $scope.fn.getPageList(0, true);
+ $scope.fn.getPageList(0, true, keyWord, allIssue);
} else {
- $scope.fn.getPageList(0);
+ $scope.fn.getPageList(0, false, keyWord, allIssue);
}
}
else {
@@ -160,9 +185,10 @@
}
});
}
+ $scope.vm.issueIds = [];
// �긽�꽭 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
- function changeDetailView(id) {
+ function changeDetailView(id, isBack = false) {
$scope.vm.tableConfigs = [];
$scope.vm.detailView = true;
@@ -173,6 +199,10 @@
// �뀒�씠釉붿쓣 �떎�떆 洹몃┫�닔 �엳寃� �뜲�씠�꽣 諛붿씤�뵫�쓣 �떎�떆�븳�떎.
var temp = angular.copy($scope.vm.responseData.data);
$scope.vm.responseData.data = angular.copy(temp);
+
+ if (!isBack) {
+ $scope.vm.issueIds.push(id);
+ }
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
@@ -184,6 +214,7 @@
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
+ $scope.vm.issueIds = [];
$scope.vm.detailView = false;
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
@@ -197,6 +228,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
+ $scope.vm.treeConfigs = [];
$scope.vm.tableConfigs.push($tableProvider.config()
.setDType("checkbox")
@@ -233,8 +265,69 @@
if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
$scope.fn.setTableColumn(issueTableConfig);
+ $scope.fn.setTreeColumn(issueTableConfig);
}
});
+ }
+
+ // �듃由� 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ function setTreeColumn(issueTableConfig) {
+ // �씪諛� 而щ읆
+ switch(issueTableConfig.key) {
+ case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("title"));
+ break;
+
+ case "PRIORITY" : // �슦�꽑�닚�쐞
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("priorityName"));
+ break;
+ case "SEVERITY" : // 以묒슂�룄
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("severityName"));
+ break;
+ case "ISSUE_TYPE" : // �씠�뒋 ���엯
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("issueTypeName"));
+ break;
+ case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("assigneeTeam"));
+ break;
+ case "REGISTER" : // �벑濡앹옄
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("register"));
+ break;
+ case "PERIOD" : // 湲곌컙
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("period"));
+ break;
+ case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("modifyDate"));
+ break;
+ case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setDName("countDownIssue"));
+ 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.treeConfigs.push($treeProvider.config()
+ .setDType("CUSTOM_FIELD")
+ .setDName(customField.id)
+ .setColumnHint(customField));
+ break;
+ }
+ }
+ }
}
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -245,6 +338,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
+ .setDName("title")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -254,7 +348,7 @@
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("priorityId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -263,22 +357,25 @@
case "SEVERITY" : // 以묒슂�룄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("severityId")
.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("issueTypeId")
+ .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("departmentName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -287,6 +384,7 @@
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("registerId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -310,10 +408,39 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
+ .setDName("downIssueCount")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
+ .setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
+ break;
+ case "COMPANY" : // �뾽泥�
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.company")
+ .setDName("companyName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_COMPANY"));
+ break;
+ case "ISP" : // ISP
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.isp")
+ .setDName("ispName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_ISP"));
+ break;
+ case "HOSTING" : // HOSTING
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.hosting")
+ .setDName("hostingName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_HOSTING"));
break;
}
@@ -327,6 +454,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("useValue"+count) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -355,9 +483,11 @@
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
function makeSearchConditions() {
var conditions = {
+ allIssue : $scope.vm.allIssue,
keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
+ issueNumber : $scope.vm.search.issueNumber,
projectType : $scope.vm.search.projectType,
combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
beginRegisterDate : "",
@@ -366,13 +496,18 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
- hideIssue : $scope.vm.hideIssue,
+ 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;
})(),
@@ -388,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;
})(),
@@ -483,18 +620,43 @@
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;
+
+ }
+
+ function getTreeList() {
+
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false) {
+ function getPageList(selectedPage, detail = false, keyWord = null, allIssue = false) {
+ $rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
}
+ if (allIssue) {
+ $scope.vm.allIssue = true;
+ $rootScope.$broadcast("getAllIssuePageList");
+ }
- if ($scope.vm.hideIssue) {
- $scope.vm.hideIssue = true;
+ if (keyWord != null) {
+ $scope.vm.search.keyWord = keyWord;
+ $rootScope.isMainSearch = true;
+ $scope.vm.allIssue = true;
+ $rootScope.$broadcast("getPageListKeyWord", {keyWord: $scope.vm.search.keyWord});
+ }
+
+ if ($scope.vm.hideCompleteIssue) {
+ $scope.vm.hideCompleteIssue = true;
+ }
+
+ if ($scope.vm.hideDownIssue) {
+ $scope.vm.hideDownIssue = true;
}
// �쁽�옱 �럹�씠吏� �젙蹂�
var currentPage = 0;
@@ -507,55 +669,80 @@
currentPage = selectedPage;
}
- // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
- if ($rootScope.issueTypeMenu != null) {
- // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
- $scope.vm.search.issueTypeIds = [];
- $scope.vm.search.issueTypeIds.push({
- fieldKey : $rootScope.issueTypeMenu.id,
- fieldValue : $rootScope.issueTypeMenu.name
- });
- }
+ // 寃��깋 湲곕낯媛� �꽭�똿
+ $scope.vm.search.issueTypeIds = [];
+ $scope.vm.projects = [];
+ if (!$scope.vm.allIssue && keyWord == null || keyWord === '') {
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
-
-
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
- var find = findProjectSearch($rootScope.workProject.id);
- if (!find) {
- $scope.vm.projects = [];
- $scope.vm.projects.push($rootScope.workProject);
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey: $rootScope.issueTypeMenu.id,
+ fieldValue: $rootScope.issueTypeMenu.name
+ });
}
+
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
+
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
+ }
+ //$scope.vm.searchAll.keyWord = "";
}
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
var conditions = $scope.fn.makeSearchConditions();
+ if ($rootScope.previousGetParams != null)
+ $rootScope.previousGetParams = null;
+
Issue.find($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
+ $scope.vm.page.selectedPage = currentPage + 1;
+ $scope.vm.responseData = result.data;
+
+ 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) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
+ result.data.data.splice(i, 1);
+ 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--;
+ }
+ }
+ }
+
if (result.data.data != null && result.data.data.length > 0) {
$scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.projectKey = result.data.data[0].projectKey;
$scope.vm.issueNumber = result.data.data[0].issueNumber;
$scope.vm.projectName = result.data.data[0].projectName;
- $scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
if (detail) {
changeDetailView(result.data.data[0].id);
}
} else {
- $scope.vm.responseData = result.data;
+ // 媛믪씠 �뾾�쓣�븣 媛믪쓣 �꽔�뼱二쇰젮怨� �븯�뒗 �쓽�룄
+ // $scope.vm.responseData = result.data;
+ result.data = $scope.vm.responseData;
}
-
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
}
+ $rootScope.spinner = false; // �봽濡쒓렇�옒�뒪 諛�
});
}
@@ -635,6 +822,7 @@
angular.forEach($scope.vm.responseData.data, function (data) {
if (data.checked) {
issueIds.push(data.id);
+ $scope.vm.projectId = data.projectId;
}
});
@@ -651,7 +839,8 @@
resolve : {
parameter : function () {
return {
- issueIds : issueIds
+ issueIds : issueIds,
+ projectId : $scope.vm.projectId
};
}
}
@@ -659,7 +848,7 @@
}
// �씠�뒋 �닔�젙 �뙘�뾽 �샇異�
- function modify(id) {
+ function modify(id, downTotalCount) {
$uibModal.open({
templateUrl : 'views/issue/issueModify.html',
size : "lg",
@@ -669,13 +858,16 @@
parameter : function () {
return {
id : id,
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id,
+ inheritPartners : $scope.vm.viewer.issueTypeVo.inheritPartners,
+ downTotalCount : downTotalCount
};
}
}
});
}
- function addRelationIssueForm(id) {
+ function addRelationIssueForm(id, project, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
@@ -685,6 +877,26 @@
parameter : function () {
return {
id : id,
+ project : project,
+ issueTypeId : issueTypeId
+ };
+ }
+ }
+ });
+ }
+
+ function addDownIssueForm(id, project, issueTypeId) {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueAddDown.html',
+ size : "lg",
+ controller : 'issueAddDownController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ project : project,
+ issueTypeId : issueTypeId
};
}
}
@@ -864,7 +1076,8 @@
resolve : {
parameter : function () {
return {
- issueTypeId : $scope.vm.issueTypeId
+ issueTypeId : $scope.vm.issueTypeId,
+ allIssue : $scope.vm.allIssue
};
}
}
@@ -926,13 +1139,16 @@
var deferred = $q.defer();
$scope.vm.partners = [];
- Issue.findPartners($resourceProvider.getContent({},
+ Issue.findPartners($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.content;
+ angular.forEach(result.data.data, function (partner) {
+ $scope.vm.partners.push(partner);
+ });
+ //$scope.vm.partnerVos = result.data.data;
}
else {
- SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // �슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // �뙆�듃�꼫 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -1018,7 +1234,6 @@
break;
}
-
$scope.vm.customFields.push(customField);
});
}
@@ -1037,42 +1252,112 @@
function getIssueTableConfigs() {
var deferred = $q.defer();
- if ($rootScope.issueTypeMenu != null){
- var content = {
- issueTypeId : $rootScope.issueTypeMenu.id
+ var content = {
+ issueTypeId : (function () {
+ var id = "";
+ if ($rootScope.allIssueList) {
+ id = -1;
+ } else {
+ id = $rootScope.getCurrentIssueTypeId();
}
-
- IssueTableConfig.detail($resourceProvider.getContent(content,
- $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- if (result.data.message.status !== "success") {
- SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
- }
-
- deferred.resolve(result.data.data);
- });
+ return id;
+ })()
}
+
+ IssueTableConfig.detail($resourceProvider.getContent(content,
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+ if (result.data.message.status !== "success") {
+ SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
return deferred.promise;
}
+ // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾
+ function onClickListMode(listMode) {
+ if ($scope.vm.listMode !== listMode) {
+ $scope.vm.listMode = listMode;
+
+ if ($scope.vm.listMode === 0) {
+ $scope.fn.getPageList(0);
+ } else {
+ $scope.fn.getPageList(0);
+ }
+ }
+ }
+
+ function setDefaultTableConfig() {
+ // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
+ $scope.vm.issueTableConfigs = [{
+ name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
+ key : "ISSUE_TITLE",
+ width : "width-140-p",
+ position : 1,
+ display : true
+ }, {
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
+ key : "PRIORITY",
+ width : "width-80-p",
+ position : 2,
+ display : true
+ }, {
+ name : $filter("translate")("common.importance"), // 以묒슂�룄
+ key : "SEVERITY",
+ width : "width-80-p",
+ position : 3,
+ display : true
+ }, {
+ name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
+ key : "ISSUE_TYPE",
+ width : "width-140-p",
+ position : 4,
+ display : true
+ }, {
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEE_TEAM",
+ width : "width-140-p",
+ position : 5,
+ display : true
+ }];
+ }
+
// 理쒖큹 �떎�뻾
function startExecute() {
+ // �씠�뒋 �긽�꽭�솕硫� �씠�뒋 �씠�룞 �궡�뿭 ���옣
+ $scope.vm.issueIds = [];
+ // 荑좏궎 �씫湲�
+ var paramKeyWord = null;
+
+ var keyWord = $rootScope.getCookie("searchKeyword");
+ if (keyWord != null && keyWord !== '') {
+ paramKeyWord = keyWord;
+ $rootScope.deleteCookie("searchKeyword");
+ }
+
// �뙆�씪誘명꽣 �씫湲�
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- getDetailList(params.projectKey, params.issueNumber);
- $rootScope.previousGetParams = null;
+ if (params.keyWord != null) {
+ paramKeyWord = params.keyWord;
+ }else {
+ getDetailList(params.projectKey, params.issueNumber);
+ return;
+ }
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
+
+ var allIssue = $rootScope.allIssueList;
var promises = {
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
getIssueStatuses : $scope.fn.getIssueStatuses(),
- getCustomFields : $scope.fn.getCustomFields()
+ getCustomFields : $scope.fn.getCustomFields(),
};
$q.all(promises).then(function (results){
@@ -1087,52 +1372,27 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
$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 {
- // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
- $scope.vm.issueTableConfigs = [{
- name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
- key : "ISSUE_TITLE",
- width : "width-140-p",
- position : 1,
- display : true
- }, {
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-80-p",
- position : 2,
- display : true
- }, {
- name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
- position : 3,
- display : true
- }, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
- position : 4,
- display : true
- }, {
- name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
- width : "width-140-p",
- position : 5,
- display : true
- }];
+ $scope.fn.setDefaultTableConfig();
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
- // �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
- $scope.fn.getVmSearchObject();
});
+ // �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
+ $scope.fn.getVmSearchObject(paramKeyWord, allIssue);
});
}
+ // this.router.navigate(['path/to'])
+ // .then(() => {
+ // window.location.reload();
+ // });
+
+
$scope.fn.startExecute();
}
--
Gitblit v1.8.0