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

jhjang

2021-12-08 7b4b71ee33c7a42383d3e6a69885d521fd7b6688

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

@@ -22,6 +22,7 @@
                    setTableColumn : setTableColumn,    //  테이블의 컬럼을 만들어준다.
                    add : add,   //  이슈 생성
                    modify : modify,    //  이슈 수정
                    addRelationIssueForm : addRelationIssueForm,    //  연관 이슈 추가
                    modifyMultiIssueStatus : modifyMultiIssueStatus,    //  이슈 다중 상태 변경
                    removes : removes,  //  이슈 삭제
                    addIssueTableConfig : addIssueTableConfig,    //  이슈 목록 테이블 설정
@@ -37,7 +38,8 @@
                    getVmSearchObject : getVmSearchObject,  //  저장한 검색 조건을 가져와서 vm 에 셋팅한다.
                    makeSearchConditions : makeSearchConditions,    //  검색 조건을 만든다.
                    getIssueTableConfigs : getIssueTableConfigs,  //  사용자 이슈 목록 테이블 설정 값을 가져와서 적용한다.
                    startExecute : startExecute //  컨트롤 로딩시 처음으로 시작되는 함수
                    startExecute : startExecute, //  컨트롤 로딩시 처음으로 시작되는 함수
                    getResponseData : getResponseData //  컨트롤 로딩시 처음으로 시작되는 함수
                };

                //  변수
@@ -100,6 +102,10 @@
                //  이슈 테이블 설정 정보 갱신
                $scope.$on("getIssueTableConfigs", function () {
                    $scope.fn.startExecute();
                });

                $scope.$on("changedIssueListMenu", function (event, args) {
                    $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
                });

                //  검색 조건을 기억한다. - 적용 보류
@@ -197,30 +203,37 @@
                        .setDAlign("text-center"));

                    //  상세형 일때때
                   if ($scope.vm.detailView) {
                        $scope.vm.tableConfigs.push($tableProvider.config()
                            .setHName("issue.issueTitle")
                            .setDName("title")
                            .setDType("renderer")
                            .setHWidth("width-100 bold")
                            .setDRenderer("ISSUE_DETAIL_FLOATING"));
                    }
                    else {
                       $scope.vm.tableConfigs.push($tableProvider.config()
                           .setHName("issue.issueTitle")
                           .setDName("title")
                           .setDType("renderer")
                           .setHWidth("bold")
                           .setDRenderer("ISSUE_DETAIL_FLOATING"));

                        angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
                            //  표시 대상인 컬럼만 화면에 그려준다.
                            if (issueTableConfig.display) {
                                //  테이블의 컬럼을 만들어준다.
                                $scope.fn.setTableColumn(issueTableConfig);
                            }
                        });
                    }
                   // if ($scope.vm.detailView) {
                   //      $scope.vm.tableConfigs.push($tableProvider.config()
                   //          .setHName("issue.issueTitle")
                   //          .setDName("title")
                   //          .setDType("renderer")
                   //          .setHWidth("bold")
                   //          .setDRenderer("ISSUE_DETAIL_FLOATING"));
                   //  }
                   //  else {
                   //     $scope.vm.tableConfigs.push($tableProvider.config()
                   //         .setHName("issue.issueTitle")
                   //         .setDName("title")
                   //         .setDType("renderer")
                   //         .setHWidth("bold")
                   //         .setDRenderer("ISSUE_DETAIL_FLOATING"));
                   //
                   //      angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
                   //          //  표시 대상인 컬럼만 화면에 그려준다.
                   //          if (issueTableConfig.display) {
                   //              //  테이블의 컬럼을 만들어준다.
                   //              $scope.fn.setTableColumn(issueTableConfig);
                   //          }
                   //      });
                   //  }
                    angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
                        //  표시 대상인 컬럼만 화면에 그려준다.
                        if (issueTableConfig.display) {
                            //  테이블의 컬럼을 만들어준다.
                            $scope.fn.setTableColumn(issueTableConfig);
                        }
                    });
                }

                //  테이블의 컬럼을 만들어준다.
@@ -228,6 +241,15 @@

                    //  일반 컬럼
                    switch(issueTableConfig.key) {
                        case "ISSUE_TITLE" :   //  이슈 제목
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("issue.issueTitle")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_TITLE"));
                            break;

                        case "PRIORITY" :   //  우선순위
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.priority")
@@ -283,6 +305,14 @@
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("modifyDate"));
                            break;
                        case "COUNT_DOWN_ISSUE" : //  하위 이슈 개수
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.countDownIssue")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("DOWN_ISSUE_COUNT"));
                            break;
                    }

@@ -489,6 +519,7 @@
                    if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
                        var find = findProjectSearch($rootScope.workProject.id);
                        if (!find) {
                            $scope.vm.projects = [];
                            $scope.vm.projects.push($rootScope.workProject);
                        }
                    }
@@ -504,18 +535,27 @@
                                $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.projectName = result.data.data[0].projectName;
                                $scope.vm.page.selectedPage = currentPage + 1;
                                $scope.vm.responseData = result.data;

                                if (detail) {
                                    changeDetailView(result.data.data[0].id);
                                }
                            } else {
                                $scope.vm.responseData = result.data;
                            }

                        }
                        else {
                            SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // 이슈 조회 실패
                        }

                    });
                }

                function getResponseData() {
                    return $scope.data;
                }

                // 이메일 프로젝트 경로로 이동 후 상세 진입시 조회
@@ -618,6 +658,22 @@
                        templateUrl : 'views/issue/issueModify.html',
                        size : "lg",
                        controller : 'issueModifyController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {
                                return {
                                    id : id,
                                };
                            }
                        }
                    });
                }

                function addRelationIssueForm(id) {
                    $uibModal.open({
                        templateUrl : 'views/issue/issueAddRelation.html',
                        size : "lg",
                        controller : 'issueAddRelationController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {
@@ -945,28 +1001,34 @@
                            else {
                                //  최초 업무 공간에 들어왔을 경우
                                $scope.vm.issueTableConfigs = [{
                                    name : $filter("translate")("issue.issueTitle"), // 이슈 제목
                                    key : "ISSUE_TITLE",
                                    width : "width-140-p",
                                    position : 1,
                                    display : true
                                }, {
                                    name : $filter("translate")("common.priority"), // 우선순위
                                    key : "PRIORITY",
                                    width : "width-80-p",
                                    position : 1,
                                    position : 2,
                                    display : true
                                }, {
                                    name : $filter("translate")("common.importance"), // 중요도
                                    key : "SEVERITY",
                                    width : "width-80-p",
                                    position : 2,
                                    position : 3,
                                    display : true
                                }, {
                                    name : $filter("translate")("issue.issueType"), // 이슈 타입
                                    key : "ISSUE_TYPE",
                                    width : "width-140-p",
                                    position : 3,
                                    position : 4,
                                    display : true
                                }, {
                                    name : $filter("translate")("common.assigneeTeam"), // 담당부서
                                    key : "ASSIGNEE_TEAM",
                                    width : "width-140-p",
                                    position : 4,
                                    position : 5,
                                    display : true
                                }];
                            }