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

이민희

2021-11-30 40f1a602453b72e5aac18cf502e40270349e2a3e

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

@@ -42,6 +42,7 @@
                $scope.fn.getRelTableConfigs = getRelTableConfigs;
                $scope.fn.getDownTableConfigs = getDownTableConfigs;
                $scope.fn.containsPartner = containsPartner;
                $scope.fn.onActivate = onActivate;

                //  이슈 목록 컨트롤러 vm, fn 상속 중
                $scope.vm.viewer = {};
@@ -85,6 +86,7 @@

                $scope.vm.issueName = "";       // 선택된 연관 일감 이름
                $scope.vm.issueId = "";       //
                $scope.vm.issueTypeId = "";
                $scope.vm.autoCompletePage = {
                    issue : {
                        page : 0,
@@ -110,8 +112,13 @@

                function changeDetailView(issue) {
                    //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
                    // $rootScope.$broadcast("makeIssueSearch", issue);
                    //$rootScope.$broadcast("makeIssueSearch",issue);
                    $scope.$parent.tableEvent.changeDetailView(issue.id);
                    $scope.fn.onActivate();
                }

                function onActivate() {
                    window.scroll(0,240);
                }

                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -279,14 +286,6 @@
                                .setDAlign("text-center")
                                .setDName("modifyDate"));
                            break;
                        // default :"ISSUE_RELATION_DELETE" //  연관 삭제
                        //     $scope.vm.relTableConfigs.push($tableProvider.config()
                        //         .setHName("issue.downIssueTitle")
                        //         .setDType("renderer")
                        //         .setHWidth("bold" + issueTableConfig.width)
                        //         .setHSort(false)
                        //         .setDRenderer("ISSUE_RELATION_DELETE"));
                        //     break;
                    }

                    //  사용자 정의 필드 컬럼
@@ -581,9 +580,6 @@
                    });
                }




                // 연관 이슈 추가
                function addRelationIssue() {
                    if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
@@ -656,6 +652,7 @@
                    $scope.vm.editor.issueStatus = false;
                    $scope.vm.issueForm.issueStatusList = [];
                    $scope.vm.issueForm.issueStatusId = "";
                    $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
                    /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
                        $scope.$apply();
                    }*/
@@ -807,7 +804,7 @@
                    $scope.fn.getDownTableConfigs();

                        Issue.detail($resourceProvider.getContent(
                        {id : $scope.vm.viewer.id, deep : "02"},
                        {id : $scope.vm.viewer.id, deep : "02", customFields : $scope.vm.customFields},
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {

                        if (result.data.message.status === "success") {
@@ -834,16 +831,19 @@
                                $scope.vm.form.issuesDown.push(result.data.data);

                                // 연관 이슈 반복문
                                angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
                                    issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
                                    $scope.vm.form.issues.push(issueRelationVo.issueRelation);
                                });
                                if (result.data.data.issueRelationVos !== null) {
                                    angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
                                        issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
                                        $scope.vm.form.issues.push(issueRelationVo.issueRelation);
                                    });
                                }

                                // 하위 이슈 반목문
                                angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
                                    $scope.vm.form.issuesDown.push(issueDownVo.issue);
                                });

                                if (result.data.data.issueDownVos !== null){
                                    angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
                                        $scope.vm.form.issuesDown.push(issueDownVo.issue);
                                    });
                                }
                                $scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
                                $scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
                            }
@@ -882,35 +882,17 @@
                        switch (issueTypeCustomField.customFieldVo.customFieldType) {
                            case "INPUT" :
                            case "SINGLE_SELECT" :
                            case "NUMBER" :
                            case "DATETIME" :
                            case "IP_ADDRESS" :
                            case "EMAIL" :
                            case "SITE" :
                            case "TEL" :
                                issueTypeCustomField.useValues = "";
                                break;

                            case "MULTI_SELECT" :
                                issueTypeCustomField.useValues = [];
                                break;

                            case "NUMBER" :
                                issueTypeCustomField.useValues = ""
                                break;

                            case "DATETIME" :
                                issueTypeCustomField.useValues = ""
                                break;

                            case "IP_ADDRESS" :
                                issueTypeCustomField.useValues = ""
                                break;

                            case "EMAIL" :
                                issueTypeCustomField.useValues = ""
                                break;

                            case "SITE" :
                                issueTypeCustomField.useValues = ""
                                break;

                            case "TEL" :
                                issueTypeCustomField.useValues = ""
                                break;
                        }