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

이민희

2021-12-07 4677f35851fd0daed02d12858e71c79056969d68

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

@@ -8,8 +8,8 @@
        'angular'
    ],
    function (app, angular) {
        app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter) {
        app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter', 'parameter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter, parameter) {


                //  함수 모음
@@ -23,49 +23,43 @@

                //  변수 모음
                $scope.vm = {
                    issueId: "",
                    issueTypeId: "",
                    issueRelTableConfigs : [{
                        name : $filter("translate")("common.priority"), // 우선순위
                        key : "PRIORITY",
                        width : "width-100-p",
                        position : 1,
                        display : true
                        display : false
                    }, {
                        name : $filter("translate")("common.importance"), // 중요도
                        key : "SEVERITY",
                        width : "width-100-p",
                        position : 2,
                        display : true
                    }, {
                        name : $filter("translate")("issue.issueType"), // 이슈 타입
                        key : "ISSUE_TYPE",
                        width : "width-100-p",
                        position : 3,
                        display : true
                        display : false
                    }, {
                        name : $filter("translate")("common.assigneeTeam"), // 담당부서
                        key : "ASSIGNEE_TEAM",
                        width : "width-50-p",
                        position : 4,
                        display : true
                        position : 3,
                        display : false
                    }, {
                        name : $filter("translate")("common.register"), // 등록자
                        key : "REGISTER",
                        width : "width-50-p",
                        position : 5,
                        display : true
                        position : 4,
                        display : false
                    }, {
                        name : $filter("translate")("common.period"), // 기간
                        key : "PERIOD",
                        width : "width-100-p",
                        position : 6,
                        display : true
                        position : 5,
                        display : false
                    }, {
                        name : $filter("translate")("common.lastChangeDate"), // 최근 변경일
                        key : "MODIFY_DATE",
                        width : "width-100-p",
                        position : 7,
                        display : true
                        position : 6,
                        display : false
                    }, {
                    }]
                };
@@ -85,7 +79,7 @@
                    $rootScope.spinner = true;

                    var content = {
                        issueId : $rootScope.currentDetailIssueId,
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                    };

@@ -131,12 +125,16 @@
                    return deferred.promise;
                }



                //  이슈 목록 테이블 설정 정보를 가져온다.
                function getRelIssueTableConfigs() {
                    var deferred = $q.defer();

                    var content = {
                        issueId : $rootScope.currentDetailIssueId,
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        delValue : $scope.vm.issueRelTableConfigs.splice(6,1),
                        issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                    };

@@ -154,7 +152,7 @@

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                    var count = 9;
                    var count = 7;
                    angular.forEach(result, function (customField) {
                        $scope.vm.issueRelTableConfigs.push({
                            name : customField.name,
@@ -172,6 +170,7 @@
                        if ($rootScope.isDefined(issueTableConfigs)) {
                            $rootScope.spinner = true;

                            // var saveTableConfigs = JSON.parse(issueTableConfigs);
                            var saveTableConfigs = JSON.parse(issueTableConfigs);

                            angular.forEach(saveTableConfigs, function (saveTableConfig) {