From bd0cc703f0a21cc04c359a96dfb11873e38148d5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:12 +0900
Subject: [PATCH] 이슈리스트에 파트너리스트 항목 추가
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 119 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 85 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 5ce58c6..256e3de 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,10 +52,11 @@
issueTypeId : "",
partnerVos : "",
search : {
- keyWord : "", // �쟾泥� 寃��깋
+ keyWord : "", // 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
+ issueNumber : "",
projectType : "BTS_PROJECT", // �봽濡쒖젥�듃 �쑀�삎
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
@@ -71,6 +72,7 @@
selectedPage : 0,
selectedPageRowCount : String(10)
},
+
tableConfigs : [], // �뀒�씠釉� �뀑�똿 �젙蹂�
treeConfigs : [], // �듃由� �뀑�똿 �젙蹂�
responseData : {
@@ -125,13 +127,9 @@
});
$scope.$on("changedIssueListMenu", function (event, args) {
- $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
- });
-
- // �긽�떒 寃��깋�떆
- $scope.$on("searchIssueList", function (event, args) {
- $scope.vm.search.keyWord = args.keyWord;
- $scope.fn.getPageList(0);
+ $scope.vm.search.keyWord = "";
+ $rootScope.isMainSearch = false;
+ //$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -161,7 +159,7 @@
}
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
- function getVmSearchObject() {
+ function getVmSearchObject(keyWord = null) {
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -175,9 +173,9 @@
// $scope.vm.projects = issueListSearchObject.projects;
// $scope.vm.registers = issueListSearchObject.registers;
- $scope.fn.getPageList(0, true);
+ $scope.fn.getPageList(0, true, keyWord);
} else {
- $scope.fn.getPageList(0);
+ $scope.fn.getPageList(0, false, keyWord);
}
}
else {
@@ -332,7 +330,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueTitle")
+ .setDName("issueNumber") /* todo �씠嫄� ���씠��濡� 蹂�寃쏀빐�빞�븯�뒗�뜲*/
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -342,7 +340,7 @@
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priority")
+ .setDName("priorityId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -351,7 +349,7 @@
case "SEVERITY" : // 以묒슂�룄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severity")
+ .setDName("severityId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -360,7 +358,7 @@
case "ISSUE_TYPE" : // �씠�뒋 �쑀�삎
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueType")
- .setDName("issueType")
+ .setDName("issueTypeId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -369,7 +367,7 @@
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("assigneeTeam")
+ .setDName("departmentName") /* todo 泥댄겕*/
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -378,7 +376,7 @@
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.register")
- .setDName("register")
+ .setDName("registerId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -387,7 +385,7 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("period")
+ .setDName("startDate")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -403,11 +401,39 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
- .setDName("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;
}
@@ -421,7 +447,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("customFieldName" + [count])
+ .setDName("useValue" + [count]) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -453,6 +479,7 @@
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 : "",
@@ -589,10 +616,17 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false) {
+ function getPageList(selectedPage, detail = false, keyWord = null) {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
+ }
+
+ if (keyWord != null) {
+ $scope.vm.search.keyWord = keyWord;
+ $rootScope.isMainSearch = true;
+
+ $rootScope.$broadcast("getPageListKeyWord", {keyWord: $scope.vm.search.keyWord});
}
if ($scope.vm.hideCompleteIssue) {
@@ -616,7 +650,7 @@
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
- if (!$rootScope.isMainSearch) {
+ if (keyWord == null || keyWord === '') {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
//$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -637,10 +671,14 @@
$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) {
@@ -675,7 +713,6 @@
} else {
$scope.vm.responseData = result.data;
}
-
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
@@ -1069,13 +1106,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);
@@ -1161,7 +1201,6 @@
break;
}
-
$scope.vm.customFields.push(customField);
});
}
@@ -1182,8 +1221,8 @@
if ($rootScope.issueTypeMenu != null){
var content = {
- issueTypeId : $rootScope.issueTypeMenu.id
- }
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
+ }
IssueTableConfig.detail($resourceProvider.getContent(content,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -1248,14 +1287,26 @@
// 理쒖큹 �떎�뻾
function startExecute() {
+ // 荑좏궎 �씫湲�
+ 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 promises = {
@@ -1263,7 +1314,7 @@
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){
@@ -1288,7 +1339,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
- $scope.fn.getVmSearchObject();
+ $scope.fn.getVmSearchObject(paramKeyWord);
});
});
}
--
Gitblit v1.8.0