From 5d6ea07024b475d94b997ad5972f433cf0b5aae4 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 18:13:38 +0900
Subject: [PATCH] - 상단 검색 기능 추가
---
src/main/webapp/scripts/app/common/common.controller.js | 138 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 9f28f65..4c12bea 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',
- function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $interval, IssueSearch, $filter, Notice, Project) {
+ '$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) {
$scope.fn = {
logout: logout, // 濡쒓렇�븘�썐
@@ -20,11 +20,20 @@
makeIssueSearch: makeIssueSearch, // �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
disconnectSocket: disconnectSocket, // �쎒 �냼耳� �뿰寃� �빐�젣
sendMessage: sendMessage,
- moveMenu : moveMenu
+ moveMenu : moveMenu,
+ findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
+ changeIssueListMenu : changeIssueListMenu,
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll // �긽�떒 寃��깋
};
$scope.vm = {
+ workProject : -1,
message: "",
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
@@ -32,7 +41,12 @@
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$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);
});
// �봽濡쒖젥�듃 紐⑸줉 �솕硫� �깉濡� 怨좎묠�떆
@@ -40,8 +54,66 @@
findAllWorkproject();
});
+ $scope.$on("changedLastProject", function () {
+ //if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ //}
+ });
+
+ // 硫붿씤 �긽�떒 寃��깋
+ function searchAll() {
+ $rootScope.isMainSearch = true;
+
+ if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+ $state.go("issues.list");
+ }
+
+ $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+ }
+
+ 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;
+ }
+ }
+
+ // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
+ if (changeProject) {
+
+ $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);
@@ -50,7 +122,6 @@
// 硫붿꽭吏� 諛쒖넚
function sendMessage() {
-
var content = {
description : $scope.vm.message,
userIds : [1]
@@ -62,7 +133,7 @@
}
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- function makeIssueSearch(projectKey, issueNumber) {
+ function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
var combinationIssueNumber = projectKey;
if (issueNumber != undefined) {
combinationIssueNumber += "-" + issueNumber;
@@ -80,6 +151,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); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -128,6 +200,9 @@
if ($rootScope.user.lastProjectId === project.id) {
$rootScope.workProject = project;
}
+
+ var id = $rootScope.workProject.id === -1 ? null : $rootScope.workProject.id;
+ $scope.fn.findIssueList(id);
}
$rootScope.projects = datas;
}
@@ -180,9 +255,56 @@
});
}
+ // �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
+
+ // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
+ function findIssueList(projectId) {
+ // �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ 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 && $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);
+ // $state.go('dashboards.dashboard');
+ }
+
+ if (selectIssueTypeId == null) {
+ $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
+
+ }
+ });
+ }
+ // ���돩蹂대뱶濡� 媛��뒗�뜲 �봽濡쒖젥�듃瑜� �깮�꽦�븯嫄곕굹 �닔�젙�빐�룄 嫄몃━�뒗 議곌굔�씠�떎.
+ // else {
+ // $state.go('dashboards.dashboard');
+ // }
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+ }
+
+
+
// �봽濡쒖젥�듃 蹂�寃�
function changeLastProject(projectId) {
$rootScope.changeLastProject(projectId);
+
+
}
// �뾽臾� 怨듦컙 蹂�寃�
@@ -193,6 +315,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") {
@@ -361,6 +484,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
--
Gitblit v1.8.0