충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 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초마다 소켓 연결을 확인합니다.");