From 1fac1465cdef9f3b4573edf1869af120c5cbee79 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 15:27:07 +0900
Subject: [PATCH] api 이슈 추가시 업체/isp/호스팅에 해당 도메인이 포함되면 해당 업체 자동 입력
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index a680cc3..af4011a 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -47,6 +47,7 @@
// 蹂��닔
$scope.vm = {
+ projectId : "",
issueTypeId : "",
partnerVos : "",
search : {
@@ -90,7 +91,8 @@
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false,
+ hideCompleteIssue : false,
+ hideDownIssue : true,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
};
@@ -113,6 +115,12 @@
$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);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -434,7 +442,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 = [];
@@ -567,8 +576,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;
@@ -581,26 +594,31 @@
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.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 = [];
+ $scope.vm.projects = [];
+ if (!$rootScope.isMainSearch) {
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+
+ $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);
+ }
}
}
@@ -611,6 +629,21 @@
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
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) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
+ 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;
@@ -710,6 +743,7 @@
angular.forEach($scope.vm.responseData.data, function (data) {
if (data.checked) {
issueIds.push(data.id);
+ $scope.vm.projectId = data.projectId;
}
});
@@ -726,7 +760,8 @@
resolve : {
parameter : function () {
return {
- issueIds : issueIds
+ issueIds : issueIds,
+ projectId : $scope.vm.projectId
};
}
}
--
Gitblit v1.8.0