- 이슈 상단 전체 검색 이후 전체 이슈 메뉴를 누르면 상세 검색 화면이 사라지는 문제 수정

이민희

2022-02-09 98f5d103033a7495b9d53fbab7c7907742c384b7

 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,28 +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 {
@@ -235,6 +327,8 @@
                // 프로젝트 변경
                function changeLastProject(projectId) {
                   $rootScope.changeLastProject(projectId);


                }

                //  업무 공간 변경
@@ -245,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") {
@@ -325,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");
                        });

                        //  참여 업무 공간 비활성화 알림 - 해당 업무 공간를 보고 있을 때
@@ -413,6 +520,7 @@
                    $scope.fn.findAllWorkproject();
                });


                //  10초마다 웹 소켓 연결을 확인하는 폴링 이벤트
                $interval(function () {
                    //$log.debug("10초마다 소켓 연결을 확인합니다.");