From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/webapp/scripts/app/common/common.controller.js |   48 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 173be03..6712ed3 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -22,11 +22,14 @@
                     sendMessage: sendMessage,
                     moveMenu : moveMenu,
                     findIssueList : findIssueList,   // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
-                    changeIssueListMenu : changeIssueListMenu
+                    changeIssueListMenu : changeIssueListMenu,
+                    setLastIssueType : setLastIssueType
                 };
 
                 $scope.vm = {
+                    workProject : -1,
                     message: "",
+                    workProjectId : -1
                 };
 
 
@@ -47,6 +50,25 @@
                     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) {
                     $rootScope.issueTypeMenu = null;
                     for (var issueType of $rootScope.workIssueTypes) {
@@ -56,11 +78,19 @@
                         }
                     }
 
+                    // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
+                    $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+
                     if ($rootScope.issueTypeMenu != null) {
                         moveMenu("issues.list");
                     }
 
                     $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+
+                    if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
+                        $scope.fn.setLastIssueType(issueTypeId);
+                    }
+
                 }
 
                 function moveMenu(stateName) {
@@ -205,11 +235,7 @@
                     });
                 }
 
-
                 //  �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
-                $scope.$on("changeLastProject", function (event, args) {
-                    findIssueList(args.id);
-                });
 
                 // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
                function findIssueList(projectId) {
@@ -219,12 +245,18 @@
                        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) {
+                               });
+                           } else {
+                               $state.go('dashboards.dashboard');
+                           }
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
@@ -237,6 +269,8 @@
                 // �봽濡쒖젥�듃 蹂�寃�
                 function changeLastProject(projectId) {
                    $rootScope.changeLastProject(projectId);
+
+
                 }
 
                 //  �뾽臾� 怨듦컙 蹂�寃�
@@ -247,6 +281,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") {
@@ -415,6 +450,7 @@
                     $scope.fn.findAllWorkproject();
                 });
 
+
                 //  10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
                 $interval(function () {
                     //$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");

--
Gitblit v1.8.0