From 98f5d103033a7495b9d53fbab7c7907742c384b7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 16:36:32 +0900
Subject: [PATCH] - 이슈 상단 전체 검색 이후 전체 이슈 메뉴를 누르면 상세 검색 화면이 사라지는 문제 수정
---
src/main/webapp/scripts/app/common/common.controller.js | 157 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 133 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index ca13508..701995f 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -6,8 +6,8 @@
function (app, angular) {
app.controller('commonController', ['$scope', '$rootScope', '$log', 'Auth', '$state', 'User', '$resourceProvider', '$uibModal', 'SweetAlert', 'Workspace', '$translate', '$q',
- '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
- function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
+ '$controller', '$injector', '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
+ function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $controller, $injector, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
$scope.fn = {
logout: logout, // 濡쒓렇�븘�썐
@@ -22,19 +22,32 @@
sendMessage: sendMessage,
moveMenu : moveMenu,
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
- changeIssueListMenu : changeIssueListMenu
+ changeIssueListMenu : changeIssueListMenu,
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll, // �긽�떒 寃��깋
+ sendCommonMail : sendCommonMail
};
$scope.vm = {
+ workProject : -1,
message: "",
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
-
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+ $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
+ });
+
+ // �씠�뒋 �쑀�삎 蹂�寃쎌떆
+ $scope.$on("modifyIssueType", function (event, args) {
+ findIssueList($rootScope.workProject != null ? $rootScope.workProject.id : null);
});
// �봽濡쒖젥�듃 紐⑸줉 �솕硫� �깉濡� 怨좎묠�떆
@@ -42,24 +55,93 @@
findAllWorkproject();
});
- function changeIssueListMenu(issueTypeId) {
+ $scope.$on("changedLastProject", function () {
+ //if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ //}
+ });
+
+ $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+ var keyWord = $rootScope.getCookie("searchKeyword");
+
+ if (keyWord == null || keyWord === '') {
+ $scope.vm.searchAll.keyWord = "";
+ }
+ });
+
+ // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+ function sendCommonMail() {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueCommonSendMail.html',
+ size : "md",
+ controller : 'issueCommonSendMailController',
+ backdrop : 'static',
+ resolve : {
+ parameter : {
+ issueId : null,
+ }
+ }
+ });
+ }
+
+ // 硫붿씤 �긽�떒 寃��깋
+ function searchAll() {
+ if ($rootScope.isDefined($scope.vm.searchAll.keyWord)) {
+ $rootScope.setCookie("searchKeyword", $scope.vm.searchAll.keyWord, 60000);
+ moveMenu("issues.list");
+ } else {
+ SweetAlert.warning($filter("translate")("common.alertSystem"), $filter("translate")("issue.pleaseEnterIssueKeyWord"));
+ }
+ }
+
+ function setLastIssueType() {
+ if (User != null) {
+ User.updateLastIssueType($resourceProvider.getContent(
+ {lastIssueTypeId: $rootScope.getCurrentIssueTypeId()},
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+
+ }
+ });
+ }
+ }
+
+ function changeIssueListMenu(issueTypeId, changeProject = true) {
$rootScope.issueTypeMenu = null;
- for (var issueType of $rootScope.workIssueTypes) {
- if (issueType.id === issueTypeId) {
- $rootScope.issueTypeMenu = issueType;
- break;
+ $rootScope.allIssueList = false;
+ if (issueTypeId == null) {
+ $rootScope.allIssueList = true;
+ $rootScope.isMainSearch = false; //�긽�꽭寃��깋 �몴�떆
+ moveMenu("issues.list");
+ }else {
+ for (var issueType of $rootScope.workIssueTypes) {
+ if (issueType.id === issueTypeId) {
+ $rootScope.issueTypeMenu = issueType;
+ break;
+ }
}
}
- if ($rootScope.issueTypeMenu != null) {
- moveMenu("issues.list");
- }
+ // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
+ if (changeProject) {
- $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+ $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
+ //$rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+
+ if ($rootScope.issueTypeMenu != null) {
+ moveMenu("issues.list");
+ }
+ }
+ //moveMenu("issues.list");
+
+ if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
+ $scope.fn.setLastIssueType(issueTypeId);
+ }
}
function moveMenu(stateName) {
- if ($state.current.name == stateName) {
+ if ($state.current.name === stateName) {
$state.reload();
} else {
$state.go(stateName);
@@ -79,7 +161,7 @@
}
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- function makeIssueSearch(projectKey, issueNumber) {
+ function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
var combinationIssueNumber = projectKey;
if (issueNumber != undefined) {
combinationIssueNumber += "-" + issueNumber;
@@ -97,6 +179,7 @@
$resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
+ $scope.fn.changeIssueListMenu(issueTypeId);
moveMenu("issues.list");
} else {
SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -147,9 +230,9 @@
}
var id = $rootScope.workProject.id === -1 ? null : $rootScope.workProject.id;
- $scope.fn.findIssueList(id);
}
$rootScope.projects = datas;
+ $scope.fn.findIssueList(id);
}
if ($rootScope.user.lastProjectId == null) {
@@ -200,27 +283,37 @@
});
}
-
// �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
- $scope.$on("changeLastProject", function (event, args) {
- findIssueList(args.id);
- });
// �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
function findIssueList(projectId) {
+
+ if ($rootScope.projects == null || $rootScope.projects.length <= 1)
+ return;
+
// �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
var conditions = {
projectId : projectId > -1 ? projectId : null,
+ useProject : true,
deep : "01" // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� 李얜뒗�떎.
}
-
IssueType.find($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(0, 100))).then(function (result) {
if (result.data.message.status === "success") {
$rootScope.workIssueTypes = result.data.data;
- if ($rootScope.workIssueTypes != null) {
- changeIssueListMenu($rootScope.workIssueTypes[0].id);
+
+ if ($rootScope.workIssueTypes != null && $rootScope.workIssueTypes.length > 0) {
+ $rootScope.workIssueTypes.forEach(function (issueType) {
+
+ //var selectIssueTypeId = null;
+ if (issueType.id === $rootScope.user.lastIssueTypeId) {
+ //selectIssueTypeId = issueType.id;
+ $scope.fn.changeIssueListMenu(issueType.id, false);
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$broadcast("findIssueListOK", { myIssueType : issueType} );
+ }
+ });
}
}
else {
@@ -234,6 +327,8 @@
// �봽濡쒖젥�듃 蹂�寃�
function changeLastProject(projectId) {
$rootScope.changeLastProject(projectId);
+
+
}
// �뾽臾� 怨듦컙 蹂�寃�
@@ -244,6 +339,7 @@
if (result.data.message.status === "success") {
$rootScope.user = result.data.data;
+ $rootScope.setCurrentIssueTypeId()
$state.go($state.current, {}, {reload: true});
if ($state.current.name === "dashboards.dashboard") {
@@ -324,6 +420,18 @@
}
});
});
+ });
+
+ // �궗�슜�옄 愿�由� - �궗�슜�옄 �벑湲� 蹂�寃� �뻽�쓣 �븣
+ $rootScope.webSocket.client.subscribe('/user/notification/changeUserLevel', function (notification) {
+ SweetAlert.warning($filter("translate")("common.changeUserLevel"), $filter("translate")("common.logoutForLevelChange"));
+ $rootScope.$broadcast("logout");
+ });
+
+ // �궗�슜�옄 愿�由� - �궗�슜�옄 遺��꽌 蹂�寃� �뻽�쓣 �븣
+ $rootScope.webSocket.client.subscribe('/user/notification/changeUserDepartment', function (notification) {
+ SweetAlert.warning($filter("translate")("common.changeUserDepartment"), $filter("translate")("common.logoutForDepartmentChange"));
+ $rootScope.$broadcast("logout");
});
// 李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由� - �빐�떦 �뾽臾� 怨듦컙瑜� 蹂닿퀬 �엳�쓣 �븣
@@ -412,6 +520,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
--
Gitblit v1.8.0