From 5d4d5135cf08208832f6308d9f03c25de17e9f66 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 22:24:55 +0900
Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정
---
src/main/webapp/scripts/app/common/common.controller.js | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 106 insertions(+), 4 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..fd7f242 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,16 @@
makeIssueSearch: makeIssueSearch, // �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
disconnectSocket: disconnectSocket, // �쎒 �냼耳� �뿰寃� �빐�젣
sendMessage: sendMessage,
- moveMenu : moveMenu
+ moveMenu : moveMenu,
+ findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
+ changeIssueListMenu : changeIssueListMenu,
+ setLastIssueType : setLastIssueType
};
$scope.vm = {
+ workProject : -1,
message: "",
+ workProjectId : -1
};
@@ -35,10 +40,60 @@
$scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
});
+ // �씠�뒋 �쑀�삎 蹂�寃쎌떆
+ $scope.$on("modifyIssueType", function (event, args) {
+ findIssueList($rootScope.workProject != null ? $rootScope.workProject.id : null);
+ });
+
// �봽濡쒖젥�듃 紐⑸줉 �솕硫� �깉濡� 怨좎묠�떆
$scope.$on("getProjectList", function () {
findAllWorkproject();
});
+
+ $scope.$on("changedLastProject", function () {
+ if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ }
+ });
+
+ 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.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+
+ if ($rootScope.issueTypeMenu != null) {
+ moveMenu("issues.list");
+ }
+ }
+ moveMenu("issues.list");
+ //$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+
+ if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
+ $scope.fn.setLastIssueType(issueTypeId);
+ }
+
+ }
function moveMenu(stateName) {
if ($state.current.name == stateName) {
@@ -50,7 +105,6 @@
// 硫붿꽭吏� 諛쒖넚
function sendMessage() {
-
var content = {
description : $scope.vm.message,
userIds : [1]
@@ -128,6 +182,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 +237,52 @@
});
}
+ // �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
+
+ // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
+ 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);
+ }
+
+ 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 +293,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 +462,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
--
Gitblit v1.8.0