Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-30 40f1a602453b72e5aac18cf502e40270349e2a3e

 src/main/webapp/scripts/app/issue/issueList.controller.js

@@ -28,6 +28,7 @@
                    listView : listView,    //  목록 화면으로 변경
                    importExcel : importExcel,  //  엑셀 import 기능 팝업 호출
                    getIssueTypes : getIssueTypes,  //  이슈 유형 목록을 가져온다.
                    getUsePartner : getUsePartner,  //  이슈 유형 별 사용하는 파트너 목록을 가져온다.
                    getPriorities : getPriorities,  //  우선순위 목록을 가져온다.
                    getSeverities : getSeverities,  //  중요도 목록을 가져온다.
                    getIssueStatuses : getIssueStatuses,    //  이슈 상태 목록을 가져온다.
@@ -42,7 +43,9 @@
                //  변수
                $scope.vm = {
                    issueTypeId : "",
                    partnerVos : "",
                    search : {
                        keyWord : "", //  전체 검색
                        title : "", //  제목
                        description : "",   //  내용
                        combinationIssueNumber : "",   //  이슈 번호
@@ -71,6 +74,7 @@
                    projects : [],  //  프로젝트
                    issueStatuses : [], //  이슈 상태
                    issueTypes : [],    //  이슈 유형
                    partners : [],    //  이슈 유형
                    priorities : [],    //  우선 순위
                    severities : [],    //  중요도
                    users : [], //  담당자
@@ -99,6 +103,7 @@
                });

                //  검색 조건을 기억한다. - 적용 보류
                //  검색 조건을 기억해서 이슈 상세 페이지로 이동
                function makeVmSearchObject() {
                    var content = {
                        conditions : JSON.stringify({
@@ -133,10 +138,10 @@
                                var issueListSearchObject = JSON.parse(result.data.data);
                                //  이슈 번호만 적용한다. - 삭제시 처리방법때문에 다른 속성은 적용 보류
                                $scope.vm.search = issueListSearchObject.search;
                                $scope.vm.users = issueListSearchObject.users;
                                $scope.vm.departments = issueListSearchObject.departments;
                                $scope.vm.projects = issueListSearchObject.projects;
                                $scope.vm.registers = issueListSearchObject.registers;
                                // $scope.vm.users = issueListSearchObject.users;
                                // $scope.vm.departments = issueListSearchObject.departments;
                                // $scope.vm.projects = issueListSearchObject.projects;
                                // $scope.vm.registers = issueListSearchObject.registers;

                                $scope.fn.getPageList(0, true);
                            } else {
@@ -317,6 +322,7 @@
                //  이슈 검색 조건을 만든다.
                function makeSearchConditions() {
                    var conditions = {
                        keyWord : $scope.vm.search.keyWord,
                        title : $scope.vm.search.title,
                        description : $scope.vm.search.description,
                        projectType : $scope.vm.search.projectType,
@@ -494,6 +500,8 @@
                        if (result.data.message.status === "success") {
                            if (result.data.data !=  null && result.data.data.length > 0) {
                                $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
                                $scope.vm.projectKey = result.data.data[0].projectKey;
                                $scope.vm.issueNumber = result.data.data[0].issueNumber;
                                $scope.vm.page.selectedPage = currentPage + 1;
                                $scope.vm.responseData = result.data;

@@ -587,7 +595,7 @@
                        resolve : {
                            parameter : function () {
                                return {
                                    id : id
                                    id : id,
                                };
                            }
                        }
@@ -738,6 +746,26 @@
                    return deferred.promise;
                }

                //  이슈유형 별 파트너 목록
                function getUsePartner() {
                    var deferred = $q.defer();
                    $scope.vm.partners = [];

                    Issue.findPartners($resourceProvider.getContent({},
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.partnerVos = result.data.content;
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // 우선순위 목록 조회 실패
                        }

                        deferred.resolve(result.data.data);
                    });

                    return deferred.promise;
                }

                //  우선순위 목록
                function getPriorities() {
                    var deferred = $q.defer();
@@ -800,6 +828,12 @@
                            angular.forEach(result.data.data, function (customField) {
                                switch (customField.customFieldType) {
                                    case "INPUT" :
                                    case "NUMBER" :
                                    case "DATETIME" :
                                    case "IP_ADDRESS" :
                                    case "EMAIL" :
                                    case "SITE" :
                                    case "TEL" :
                                        customField.useValues = "";
                                        break;

@@ -807,6 +841,7 @@
                                    case "SINGLE_SELECT" :
                                        customField.useValues = [];
                                        break;

                                }

                                $scope.vm.customFields.push(customField);
@@ -844,6 +879,7 @@

                    return deferred.promise;
                }

                //  최초 실행
                function startExecute() {
                    // 파라미터 읽기
@@ -851,7 +887,7 @@
                    if ($rootScope.isDefined(params)) {
                        $rootScope.$broadcast("makeIssueSearch", {  projectKey : params.projectKey, issueNumber : params.issueNumber });
                        $rootScope.previousGetParams = null;
                        $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
                        // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
                        return;
                    }