From 0f59a76b263ba6cd79380a729f38bfca92a907dd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 17:59:17 +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 | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 46c4c54..a4ffb6e 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -66,15 +66,13 @@
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
issueTypeIds : [] // �씠�뒋 �쑀�삎 寃��깋
},
- searchAll : {
- keyWord : "", // �쟾泥� 寃��깋
- },
searchView : false, // �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
detailView : false, // �긽�꽭 紐⑤뱶 蹂�寃� 媛�
page : {
selectedPage : 0,
selectedPageRowCount : String(10)
},
+
tableConfigs : [], // �뀒�씠釉� �뀑�똿 �젙蹂�
treeConfigs : [], // �듃由� �뀑�똿 �젙蹂�
responseData : {
@@ -129,13 +127,9 @@
});
$scope.$on("changedIssueListMenu", function (event, args) {
- $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
- });
-
- // �긽�떒 寃��깋�떆
- $rootScope.$on("searchIssueList", function (event, args) {
- $scope.vm.searchAll.keyWord = args.keyWord;
- $scope.fn.getPageList(0);
+ $scope.vm.search.keyWord = "";
+ $rootScope.isMainSearch = false;
+ //$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -165,7 +159,7 @@
}
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
- function getVmSearchObject() {
+ function getVmSearchObject(keyWord = null) {
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -179,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 {
@@ -336,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")
@@ -346,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")
@@ -355,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")
@@ -364,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")
@@ -373,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")
@@ -382,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")
@@ -391,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")
@@ -407,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;
}
@@ -425,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)
@@ -587,6 +609,7 @@
}
return conditions;
+
}
function getTreeList() {
@@ -594,14 +617,17 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false, keyWord = "") {
+ function getPageList(selectedPage, detail = false, keyWord = null) {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
}
- if (keyWord !== "") {
+ if (keyWord != null) {
$scope.vm.search.keyWord = keyWord;
+ $rootScope.isMainSearch = true;
+
+ $rootScope.$broadcast("getPageListKeyWord", {keyWord: $scope.vm.search.keyWord});
}
if ($scope.vm.hideCompleteIssue) {
@@ -625,7 +651,7 @@
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
- if ($scope.vm.searchAll.keyWord == null || $scope.vm.searchAll.keyWord === "") {
+ if (keyWord == null || keyWord === '') {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
//$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -651,6 +677,9 @@
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
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) {
@@ -1078,13 +1107,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);
@@ -1170,7 +1202,6 @@
break;
}
-
$scope.vm.customFields.push(customField);
});
}
@@ -1191,8 +1222,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) {
@@ -1257,13 +1288,21 @@
// 理쒖큹 �떎�뻾
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 });
if (params.keyWord != null) {
- $scope.vm.searchAll.keyWord = params.keyWord;
- getPageList(0,false, params.keyWord);
+ paramKeyWord = params.keyWord;
}else {
getDetailList(params.projectKey, params.issueNumber);
return;
@@ -1276,7 +1315,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){
@@ -1301,7 +1340,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇���꽌 �씠�뒋 紐⑸줉 寃��깋�쓣 吏꾪뻾�븳�떎.
- $scope.fn.getVmSearchObject();
+ $scope.fn.getVmSearchObject(paramKeyWord);
});
});
}
--
Gitblit v1.8.0