OWL ITS + 탐지시스템(인터넷 진흥원)
wyu
2021-11-26 9cdb1242b6b717430ac04a843392fc9733d50bdb
이슈 상세 유형별 수정
6개 파일 변경됨
116 ■■■■ 파일 변경됨
src/main/webapp/scripts/app/issue/issueAdd.controller.js 18 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueDetail.controller.js 17 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueModify.controller.js 45 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueAdd.html 12 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueDetail.html 12 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueModify.html 12 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -35,7 +35,8 @@
                    removeManager : removeManager,  //  담당자 삭제
                    removeDepartment : removeDepartment,  //  담당부서 삭제
                    setIssueTypeTemplate : setIssueTypeTemplate,    //  이슈 유형 템플릿 적용하기
                    startExecute : startExecute //  컨트롤 로딩시 처음으로 시작되는 함수
                    startExecute : startExecute, //  컨트롤 로딩시 처음으로 시작되는 함수
                    containsPartner : containsPartner
                };
                $scope.vm = {
@@ -309,6 +310,21 @@
                    });
                }
                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;
                    if ($scope.vm.viewer.useCompanyVo != null) {
                        $scope.vm.viewer.useCompanyVo.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;
                }
                //  담당자 autocomplete page 업데이트트
                function getUserListCallBack(result) {
                    $scope.vm.autoCompletePage.user.totalPage = result.data.page.totalPage;
src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -41,6 +41,7 @@
                $scope.fn.addDownIssueTableConfig = addDownIssueTableConfig;      // 하위 이슈 목록 테이블 설정
                $scope.fn.getRelTableConfigs = getRelTableConfigs;
                $scope.fn.getDownTableConfigs = getDownTableConfigs;
                $scope.fn.containsPartner = containsPartner;
                //  이슈 목록 컨트롤러 vm, fn 상속 중
                $scope.vm.viewer = {};
@@ -729,6 +730,7 @@
                            parameter : function () {
                                return {
                                    issueTypeId : $scope.vm.viewer.issueTypeVo.id
                                };
                            }
                        }
@@ -780,6 +782,21 @@
                    });
                }
                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;
                    if ($scope.vm.viewer.useCompanyVo != null) {
                        $scope.vm.viewer.useCompanyVo.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;
                }
                //  이슈 상세 정보 조회
                function getIssueDetail() {
                    //  초기화 해야할 할목을 지정하여 다른 이슈를 클릭할 때 초기화해준다.
src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -9,9 +9,9 @@
    ],
    function (app, angular) {
        app.controller('issueModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$injector',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'parameter', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'parameter', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'HostingField', 'IssueTypeCustomField', '$filter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $injector, $controller, $tableProvider, SweetAlert, $timeout,
                      $stateParams, $q, parameter, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter) {
                      $stateParams, $q, parameter, Issue, User, AttachedFile, IssueType, Priority, Severity, HostingField, IssueTypeCustomField, $filter) {
                $scope.fn = {
                    cancel : cancel,    //  팝업 창 닫기
@@ -37,10 +37,13 @@
                    removeDepartment : removeDepartment,  //  담당부서 삭제
                    removeUploadFile : removeUploadFile,    //  특정 파일을 삭제
                    setIssueTypeTemplate : setIssueTypeTemplate,    //  이슈 유형 템플릿 적용하기
                    startExecute : startExecute //  최초 실행
                    startExecute : startExecute, //  최초 실행
                    containsPartner : containsPartner,
                    getPartners : getPartners
                };
                $scope.vm = {
                    companyVos : "",
                    search : {
                        id : parameter.id,
                        deep : "02"    //  프로젝트 연관된 모든 정보를 어느정도까지 가져올지 결정, 01 - 사용자, 관리자 정보
@@ -139,6 +142,11 @@
                        }
                    }
                });
                $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
                     $scope.vm.companyVos = $scope.fn.getPartners();
                });
                //  업로드 파일 삭제
                function removeUploadFile(index) {
@@ -654,6 +662,21 @@
                    return deferred.promise;
                }
                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;
                    if ($scope.vm.companyVos != null) {
                        $scope.vm.companyVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;
                }
                //  중요도 목록
                function getSeverities() {
                    var deferred = $q.defer();
@@ -872,14 +895,26 @@
                    }
                }
                function getPartners() {
                    HostingField.getCompanyList($resourceProvider.getContent(
                        {},
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.companyVos = result.data.content;
                        }
                    });
                }
                //  최초 실행
                function startExecute() {
                    var promises = {
                        detail : $scope.fn.detail(),
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities()
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                    };
                    $q.all(promises).then(function (results) {
src/main/webapp/views/issue/issueAdd.html
@@ -270,7 +270,7 @@
                </div>
            </div>
            <hr>
            <div class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span>
@@ -278,7 +278,7 @@
                </div>
            </div>
            <div ng-show="vm.viewer.useCompanyVo[0].name == '업체'" class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="companyField.name">업체이름</span> </label>
@@ -362,7 +362,7 @@
                </div>
            </div>
            <p></p>
            <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
            <div ng-show="fn.containsPartner('ISP')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>
@@ -370,7 +370,7 @@
                </div>
            </div>
            <div class="row">
            <div ng-show="fn.containsPartner('ISP')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="ispField.name">ISP 이름</span> </label>
@@ -468,7 +468,7 @@
                </div>
            </div>
            <p></p>
            <div ng-show="vm.viewer.useCompanyVo[0].name == '호스팅' || vm.viewer.useCompanyVo[1].name == '호스팅' || vm.viewer.useCompanyVo[2].name == '호스팅'" class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">호스팅 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>
@@ -476,7 +476,7 @@
                </div>
            </div>
            <div ng-show="vm.viewer.useCompanyVo[0].name == '호스팅' || vm.viewer.useCompanyVo[1].name == '호스팅' || vm.viewer.useCompanyVo[2].name == '호스팅'" class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="hostingField.name">호스팅 이름</span> </label>
src/main/webapp/views/issue/issueDetail.html
@@ -237,7 +237,7 @@
                <hr>
<!--                <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} &nbsp; / &nbsp; {{vm.viewer.projectVo.name}}</span>-->
                <div ng-show="vm.viewer.useCompanyVo[0].name == '업체'" class="row">
                <div ng-show="fn.containsPartner('업체')" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
                            <h6 class="info_font" translate="companyField.info">업체정보</h6>
@@ -245,7 +245,7 @@
                    </div>
                </div>
                <div ng-show="vm.viewer.useCompanyVo[0].name == '업체'" class="row">
                <div ng-show="fn.containsPartner('업체')" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
                            <span translate="companyField.companyName">업체명</span>:
@@ -290,7 +290,7 @@
                    </div>
                </div>
                <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
                <div ng-show="fn.containsPartner('ISP');" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
                            <h6 class="info_font" translate="ispField.info">ISP정보</h6>
@@ -298,7 +298,7 @@
                    </div>
                </div>
                <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
                <div ng-show="fn.containsPartner('ISP');" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
                            <span translate="ispField.ispName">ISP명</span>:
@@ -350,7 +350,7 @@
                    </div>
                </div>
                <div ng-show="vm.viewer.useCompanyVo[0].name == '호스팅' || vm.viewer.useCompanyVo[1].name == '호스팅' || vm.viewer.useCompanyVo[2].name == '호스팅'" class="row">
                <div ng-show="fn.containsPartner('호스팅');" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
                            <h6 class="info_font" translate="hostingField.info">호스팅정보</h6>
@@ -358,7 +358,7 @@
                    </div>
                </div>
                <div ng-show="vm.viewer.useCompanyVo[0].name == '호스팅' || vm.viewer.useCompanyVo[1].name == '호스팅' || vm.viewer.useCompanyVo[2].name == '호스팅'" class="row">
                <div ng-show="fn.containsPartner('호스팅');" class="row">
                    <div class="col-sm-2">
                        <div class="form-group">
src/main/webapp/views/issue/issueModify.html
@@ -270,7 +270,7 @@
                </div>
            </div>
            <hr>
            <div class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span>
@@ -278,7 +278,7 @@
                </div>
            </div>
            <div class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="companyField.name">업체이름</span> </label>
@@ -362,7 +362,7 @@
                </div>
            </div>
            <p></p>
            <div class="row">
            <div ng-show="fn.containsPartner('ISP')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>
@@ -370,7 +370,7 @@
                </div>
            </div>
            <div class="row">
            <div ng-show="fn.containsPartner('ISP')"  class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="ispField.name">ISP 이름</span> </label>
@@ -468,7 +468,7 @@
                </div>
            </div>
            <p></p>
            <div class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">호스팅 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>
@@ -476,7 +476,7 @@
                </div>
            </div>
            <div class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="hostingField.name">호스팅 이름</span> </label>