OWL ITS + 탐지시스템(인터넷 진흥원)
jhjang
2021-12-12 5d6ea07024b475d94b997ad5972f433cf0b5aae4
- 상단 검색 기능 추가
6개 파일 변경됨
81 ■■■■ 파일 변경됨
src/main/webapp/i18n/ko/global.json 1 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/common/common.controller.js 19 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueList.controller.js 48 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueManager.controller.js 5 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/config.js 3 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/common/header.html 5 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/i18n/ko/global.json
@@ -154,6 +154,7 @@
    "issue": {
        "issueType": "이슈 유형",
        "managementIssue": "이슈 관리",
        "searchIssue": "이슈 검색",
        "createIssue": "이슈 만들기",
        "issueStatus": "이슈 상태",
        "issueNumber": "이슈 번호",
src/main/webapp/scripts/app/common/common.controller.js
@@ -23,13 +23,17 @@
                    moveMenu : moveMenu,
                    findIssueList : findIssueList,   // 사이드바 이슈 목록 가져오기
                    changeIssueListMenu : changeIssueListMenu,
                    setLastIssueType : setLastIssueType
                    setLastIssueType : setLastIssueType,
                    searchAll : searchAll       // 상단 검색
                };
                $scope.vm = {
                    workProject : -1,
                    message: "",
                    workProjectId : -1
                    workProjectId : -1,
                    searchAll : {
                        keyWord : ""
                    }
                };
@@ -56,6 +60,17 @@
                    //}
                });
                // 메인 상단 검색
                function searchAll() {
                    $rootScope.isMainSearch = true;
                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                        $state.go("issues.list");
                    }
                    $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
                }
                function setLastIssueType() {
                    if (User != null) {
                        User.updateLastIssueType($resourceProvider.getContent(
src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -115,6 +115,13 @@
                    $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
                });
                // 상단 검색시
                $scope.$on("searchIssueList", function (event, args) {
                    $scope.vm.search.keyWord = args.keyWord;
                    $scope.fn.getPageList(0);
                    $rootScope.isMainSearch = false;
                });
                //  검색 조건을 기억한다. - 적용 보류
                //  검색 조건을 기억해서 이슈 상세 페이지로 이동
                function makeVmSearchObject() {
@@ -581,26 +588,31 @@
                        currentPage = selectedPage;
                    }
                    // 메뉴에서 선택된 이슈 유형을 기본으로 추가
                    if ($rootScope.issueTypeMenu != null) {
                        // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
                        $scope.vm.search.issueTypeIds = [];
                        $scope.vm.search.issueTypeIds.push({
                            fieldKey : $rootScope.issueTypeMenu.id,
                            fieldValue : $rootScope.issueTypeMenu.name
                        });
                    }
                    //  검색 조건을 저장한다.
                    //$scope.fn.makeVmSearchObject();
                    // 현재 선택된 프로젝트를 검색 기본으로 추가
                    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);
                    // 검색 기본값 세팅
                    $scope.vm.search.issueTypeIds = [];
                    $scope.vm.projects = [];
                    if (!$rootScope.isMainSearch) {
                        // 메뉴에서 선택된 이슈 유형을 기본으로 추가
                        if ($rootScope.issueTypeMenu != null) {
                            // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
                            $scope.vm.search.issueTypeIds.push({
                                fieldKey: $rootScope.issueTypeMenu.id,
                                fieldValue: $rootScope.issueTypeMenu.name
                            });
                        }
                        //  검색 조건을 저장한다.
                        //$scope.fn.makeVmSearchObject();
                        // 현재 선택된 프로젝트를 검색 기본으로 추가
                        if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
                            var find = findProjectSearch($rootScope.workProject.id);
                            if (!find) {
                                $scope.vm.projects.push($rootScope.workProject);
                            }
                        }
                    }
src/main/webapp/scripts/app/issue/issueManager.controller.js
@@ -39,6 +39,11 @@
                    }
                });
                // 상단 검색시
                $scope.$on("searchIssueList", function (event, args) {
                    $scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
                });
                function start() {
                    if ($rootScope.issueTypeMenu != null) {
                        $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
src/main/webapp/scripts/config.js
@@ -67,6 +67,9 @@
                //  최고관리자 존재 여부
                $rootScope.hasSuperUser = false;
                //  메인 검색 여부
                $rootScope.isMainSearch = false;
                // 대시보드 선택 0:전체 1:프로젝트
                $rootScope.dashboard = 0;
src/main/webapp/views/common/header.html
@@ -29,12 +29,13 @@
            <div class="input-group">
                <input class="form-control"
                       type="text"
                       tabindex="-1"
                       tabindex="-2"
                       maxlength="300"
                       kr-input
                       owl-auto-focus
                       ng-model="vm.searchAll.keyWord"
                       placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}">
                       placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}"
                       ng-enter="fn.searchAll(0)">
                <div class="input-group-prepend ml-10">
                    <button class="btn btn-navy" ng-click="fn.searchAll(0)"> <span translate="common.search">검색</span></button>
                </div>