사용자 정의 필드 관련 오류 수정

wyu

2021-11-30 a93ef198d8ac95975560d71e53aa1aa59d8c5125

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

@@ -41,6 +41,8 @@
                $scope.fn.addDownIssueTableConfig = addDownIssueTableConfig;      // 하위 이슈 목록 테이블 설정
                $scope.fn.getRelTableConfigs = getRelTableConfigs;
                $scope.fn.getDownTableConfigs = getDownTableConfigs;
                $scope.fn.containsPartner = containsPartner;
                $scope.fn.onActivate = onActivate;

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

                $scope.vm.issueName = "";       // 선택된 연관 일감 이름
                $scope.vm.issueId = "";       //
                $scope.vm.issueTypeId = "";
                $scope.vm.autoCompletePage = {
                    issue : {
                        page : 0,
@@ -109,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}));
@@ -205,10 +213,12 @@
                }

                //  테이블의 연관 이슈 컬럼을 만들어준다.
                function setRelTableColumn(issueTableConfig) {
                function setRelTableColumn(Rel_issueTableConfig) {

                    //  연관 이슈 컬럼
                    switch(issueTableConfig.key) {
                    switch(Rel_issueTableConfig.key) {

                        // 연관 이슈 구분
                        case "RELATION_ISSUE_TYPE" :
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("issue.relationIssueType")
@@ -217,6 +227,7 @@
                                .setHSort(false)
                                .setDRenderer("ISSUE_RELATION_TYPE"))
                            break;
                        // 연관 이슈 제목
                        case "RELATION_ISSUE_TITLE" :
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("issue.relationIssueTitle")
@@ -230,7 +241,7 @@
                                .setHName("common.priority")
                                .setDName("priorityName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("REL_COMMON_PRIORITY"));
                            break;
@@ -239,73 +250,58 @@
                                .setHName("common.importance")
                                .setDName("severityName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("REL_COMMON_SEVERITY"));
                            break;
                        case "ISSUE_TYPE" : //  이슈 타입
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("issue.issueType")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("issueTypeName"));
                            break;
                        case "ASSIGNEE_TEAM" :   //  담당부서
                        case "ASSIGNEE_TEAM" :   // 연관 이슈 담당부서
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.assigneeTeam")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_DEPARTMENT"));
                                .setDRenderer("REL_ISSUE_DEPARTMENT"));
                            break;

                        case "REGISTER" :   //  등록자
                        case "REGISTER" :   // 연관 이슈  등록자
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.register")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("REL_REGISTER"));
                            break;
                        case "PERIOD" : //  기간
                        case "PERIOD" : // 연관 이슈 기간
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.period")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_DUE_DATE"));
                                .setDRenderer("REL_ISSUE_DUE_DATE"));
                            break;
                        case "MODIFY_DATE" : //  최근 변경일
                        case "MODIFY_DATE" : // 연관 이슈  최근 변경일
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.lastChangeDate")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                .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;
                    }

                    //  사용자 정의 필드 컬럼
                    if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
                    if (Rel_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
                        //  만약 이슈 테이블 컬럼명이 표시되지 않으면 이쪽이 문제
                        for (var count in $scope.vm.customFields) {
                            var customField = $scope.vm.customFields[count];

                            if (customField.id === Number(issueTableConfig.key.substring(13))) {
                                $scope.vm.tableConfigs.push($tableProvider.config()
                            if (customField.id === Number(Rel_issueTableConfig.key.substring(13))) {
                                $scope.vm.relTableConfigs.push($tableProvider.config()
                                    .setHName(customField.name)
                                    .setDType("renderer")
                                    .setHWidth("bold " + issueTableConfig.width)
                                    .setHWidth("bold " + Rel_issueTableConfig.width)
                                    .setDAlign("text-center")
                                    .setColumnHint(customField)
                                    .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
                                    .setDRenderer("REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
                                break;
                            }
                        }
@@ -314,91 +310,85 @@


                //  테이블의 하위 이슈 컬럼을 만들어준다.
                function setDownTableColumn(issueTableConfig) {
                function setDownTableColumn(Down_issueTableConfig) {
                    // if (issueTableConfig == null) return;

                    //  하위 이슈 컬럼
                    switch(issueTableConfig.key) {
                        case "DOWN_ISSUE_TITLE" :   //  하위 이슈 제목
                    switch(Down_issueTableConfig.key) {
                        //  하위 이슈 제목
                        case "DOWN_ISSUE_TITLE" :
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("issue.downIssueTitle")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_DOWN_MOVE"));
                            break;
                        case "PRIORITY" :   //  우선순위
                        case "PRIORITY" :   // 하위 이슈 우선순위
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.priority")
                                .setDName("priorityName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("COMMON_PRIORITY"));
                                .setDRenderer("DOWN_COMMON_PRIORITY"));
                            break;
                        case "SEVERITY" :   //  중요도
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.importance")
                                .setDName("severityName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("COMMON_SEVERITY"));
                            break;
                        case "ISSUE_TYPE" : //  이슈 타입
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("issue.issueType")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("issueTypeName"));
                                .setDRenderer("DOWN_COMMON_SEVERITY"));
                            break;
                        case "ASSIGNEE_TEAM" :   //  담당부서
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.assigneeTeam")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_DEPARTMENT"));
                                .setDRenderer("DOWN_ISSUE_DEPARTMENT"));
                            break;
                        case "REGISTER" :   //  등록자
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.register")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("REGISTER"));
                                .setDRenderer("DOWN_REGISTER"));
                            break;
                        case "PERIOD" : //  기간
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.period")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("ISSUE_DUE_DATE"));
                                .setDRenderer("DOWN_ISSUE_DUE_DATE"));
                            break;
                        case "MODIFY_DATE" : //  최근 변경일
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.lastChangeDate")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setHWidth("bold " + Down_issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("modifyDate"));
                            break;
                    }

                    //  사용자 정의 필드 컬럼
                    if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") === -1) {
                    if (Down_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
                        //  만약 이슈 테이블 컬럼명이 표시되지 않으면 이쪽이 문제
                        for (var count in $scope.vm.customFields) {
                            var customField = $scope.vm.customFields[count];

                            if (customField.id === Number(issueTableConfig.key.substring(13))) {
                            if (customField.id === Number(Down_issueTableConfig.key.substring(13))) {
                                $scope.vm.downTableConfigs.push($tableProvider.config()
                                    .setHName(customField.name)
                                    .setDType("renderer")
                                    .setHWidth("bold " + issueTableConfig.width)
                                    .setHWidth("bold " + Down_issueTableConfig.width)
                                    .setDAlign("text-center")
                                    .setColumnHint(customField)
                                    .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
                                    .setDRenderer("DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
                                break;
                            }
                        }
@@ -432,11 +422,11 @@
                        .setHSort(false)
                        .setDAlign("text-center"))

                    angular.forEach($scope.vm.relTableConfigs, function (issueTableConfig) {
                    angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
                        //  표시 대상인 컬럼만 화면에 그려준다.
                        if (issueTableConfig.display) {
                        if (Rel_issueTableConfig.display) {
                            //  테이블의 컬럼을 만들어준다.
                            $scope.fn.setRelTableColumn(issueTableConfig);
                            $scope.fn.setRelTableColumn(Rel_issueTableConfig);
                        }
                    });
                }
@@ -460,11 +450,11 @@
                        .setHSort(false)
                        .setDAlign("text-center"))

                    angular.forEach($scope.vm.downTableConfigs, function (issueTableConfig) {
                    angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
                        //  표시 대상인 컬럼만 화면에 그려준다.
                        if (issueTableConfig.display) {
                        if (Down_issueTableConfig.display) {
                            //  테이블의 컬럼을 만들어준다.
                            $scope.fn.setDownTableColumn(issueTableConfig);
                            $scope.fn.setDownTableColumn(Down_issueTableConfig);
                        }
                    });
                }
@@ -472,7 +462,8 @@
                // 연관 이슈 상세 조회
                function getRelTableConfigs() {
                    var content = {
                        issueId : $scope.vm.viewer.id
                        issueId : $scope.vm.viewer.id,
                        issueTypeId : $rootScope.getCurrentIssueTypeId()
                    };

                    IssueTableConfig.relationDetail($resourceProvider.getContent(
@@ -507,11 +498,11 @@
                                    .setHWidth("width-60-p bold")
                                    .setHSort(false)
                                    .setDRenderer("ISSUE_RELATION_MOVE"))
                                angular.forEach($scope.vm.issueRelTableConfigs, function (issueTableConfig) {
                                angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
                                    //  표시 대상인 컬럼만 화면에 그려준다.
                                    if (issueTableConfig.display) {
                                    if (Rel_issueTableConfig.display) {
                                        //  테이블의 컬럼을 만들어준다.
                                        $scope.fn.setRelTableColumn(issueTableConfig);
                                        $scope.fn.setRelTableColumn(Rel_issueTableConfig);

                                    }
                                });
@@ -536,7 +527,8 @@
                // 하위 이슈 상세 조회
                function getDownTableConfigs() {
                    var content = {
                        issueId : $scope.vm.viewer.id
                        issueId : $scope.vm.viewer.id,
                        issueTypeId : $rootScope.getCurrentIssueTypeId()
                    };

                    IssueTableConfig.downDetail($resourceProvider.getContent(
@@ -562,11 +554,11 @@
                                    .setHWidth("width-60-p bold")
                                    .setHSort(false)
                                    .setDRenderer("ISSUE_DOWN_MOVE"))
                                angular.forEach($scope.vm.issueDownTableConfigs, function (issueTableConfig) {
                                angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
                                    //  표시 대상인 컬럼만 화면에 그려준다.
                                    if (issueTableConfig.display) {
                                    if (Down_issueTableConfig.display) {
                                        //  테이블의 컬럼을 만들어준다.
                                        $scope.fn.setDownTableColumn(issueTableConfig);
                                        $scope.fn.setDownTableColumn(Down_issueTableConfig);
                                    }
                                });
                                $scope.vm.downTableConfigs.push($tableProvider.config()
@@ -587,9 +579,6 @@
                        }
                    });
                }




                // 연관 이슈 추가
                function addRelationIssue() {
@@ -663,9 +652,10 @@
                    $scope.vm.editor.issueStatus = false;
                    $scope.vm.issueForm.issueStatusList = [];
                    $scope.vm.issueForm.issueStatusId = "";
                    if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
                    $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
                    /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
                        $scope.$apply();
                    }
                    }*/
                }

                //  이슈 상태 변경
@@ -678,7 +668,8 @@
                        resolve : {
                            parameter : function () {
                                return {
                                    issueIds : [$scope.vm.viewer.id]
                                    issueIds : [$scope.vm.viewer.id],
                                    projectId : $scope.vm.viewer.projectVo.id
                                };
                            }
                        }
@@ -732,7 +723,14 @@
                        size : "lg",
                        controller : 'issueAddRelationTableConfigController',
                        backdrop : 'static',
                        resolve : {}
                        resolve : {
                            parameter : function () {
                                return {
                                    issueTypeId : $scope.vm.viewer.issueTypeVo.id

                                };
                            }
                        }
                    });
                }

@@ -743,7 +741,14 @@
                        size : "lg",
                        controller : 'issueAddDownTableConfigController',
                        backdrop : 'static',
                        resolve : {}
                        resolve : {
                            parameter : function () {
                                return {
                                    issueTypeId : $scope.vm.viewer.issueTypeVo.id
                                };

                            }
                        }
                    });
                }

@@ -775,6 +780,21 @@
                    });
                }

                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;

                    if ($scope.vm.viewer.usePartnerVos != null) {
                        $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;

                }

                //  이슈 상세 정보 조회
                function getIssueDetail() {
                    //  초기화 해야할 할목을 지정하여 다른 이슈를 클릭할 때 초기화해준다.
@@ -784,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") {
@@ -803,7 +823,6 @@
                                //  이슈에서 사용자가 선택한 사용자 정의 필드 값을 입력 폼에 셋팅한다.
                                $scope.fn.setUseValueByIssueTypeCustomFields(result.data.data.issueCustomFieldValueVos);


                                // 연관 일감
                                $scope.vm.issueName = "";
                                $scope.vm.form.issues = [];
@@ -812,23 +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);
                                });


                                // // wyu
                                // angular.forEach(result.data.data.issueRelationVos, function (issueRelationColum){
                                //     issueRelationColum.issueRelation = $scope.vm.issueRelation;
                                //     $scope.vm.form.issues.push(issueRelationColum.issueRelation);
                                // });

                                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;
                            }
@@ -867,6 +882,12 @@
                        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;

@@ -1027,6 +1048,10 @@
                        resolve : {
                            parameter : function () {
                                return {
                                    departmentVos : [$scope.vm.form.issues[0].departmentVos],
                                    issueCompanyFields : [$scope.vm.form.issues[0].issueCompanyVos],
                                    issueIspFields : [$scope.vm.form.issues[0].issueIspVos],
                                    issueHostingFields : [$scope.vm.form.issues[0].issueHostingVos],
                                    issueId : issueId,
                                    projectId : projectId
                                };
@@ -1068,7 +1093,6 @@
                        }
                    });
                }

            }
        ]);
    }