OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2021-11-03 8c71c843a0a7980446ce7de1e3d3e3eace960927
사용자 등급 관리 프론트 수정
8개 파일 변경됨
159 ■■■■■ 파일 변경됨
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/workspace/levelModify.controller.js 35 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js 38 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js 4 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/workspace/workspaceLevelAdd.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/workspace/workspaceLevelModify.html 66 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/workspace/workspaceUserConfig.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/workspace/workspaceUserLevelConfig.html 10 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -285,7 +285,7 @@
                                        case "USER_LEVEL_MODIFY":
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.levelName.replace(/</gi, '&lt;') + "</span>";
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyLevel(data.id)'>" + scope.data.levelName + "</span>";
                                            }
                                            else {
                                                makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.levelName + "</span>";
src/main/webapp/scripts/app/workspace/levelModify.controller.js
@@ -12,17 +12,16 @@
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {
                $scope.fn = {
                    getUserLevelList : getUserLevelList,  //  사용자 등급 관리 리스트
                    cancel : cancel,    //  팝업 창 닫기
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    modifyUserPermission : modifyUserPermission,   //  권한 변경
                    //modifyUserPermission : modifyUserPermission,   //  권한 변경
                    //detail : detail //  상세 정보
                };
                $scope.vm = {
                    search : {
                        id : parameter.id
                    },
                    id : parameter.id,
                    form : {
                        levelName : "",
                        permWorkspaceSetting : false,
@@ -35,6 +34,27 @@
                        permGuide : false
                    }
                };
                //  사용자 등급 관리 목록 조회
                function getUserLevelList() {
                    var conditions = {
                        id : $scope.vm.id
                    };
                    //테이블 리스트 데이터 컨트롤러 요청
                    UserWorkspace.levelFind($resourceProvider.getContent(conditions,
                        $resourceProvider.getPageContent(0, 10))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.form.levelName = result.data.data[0].levelName; //levelName 가져오기
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "사용자 등급 목록 조회 실패"
                        }
                    });
                }
                function formCheck(formInvalid) {
                    if (formInvalid) {
@@ -54,7 +74,7 @@
                        //description : $rootScope.preventXss($scope.vm.form.description)
                    };
                    UserWorkspace.modify($resourceProvider.getContent(condition,
                    UserWorkspace.modifyLevel($resourceProvider.getContent(condition,
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -99,7 +119,7 @@
                //  공지사항 상세 조회
                $scope.fn.detail();*/
                function modifyUserPermission(userPermission ) {
                /*function modifyUserPermission(userPermission ) {
                    UserWorkspace.levelModify($resourceProvider.getContent(userPermission,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {
                        if (result.data.message.status === "success") {
@@ -108,7 +128,8 @@
                            SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "참여 상태 변경 실패"
                        }
                    });
                }
                }*/
                $scope.fn.getUserLevelList();
            }]);
    });
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -16,11 +16,10 @@
                /*  $scope.fn 상속 중  */
                $scope.fn.getUserLevelList = getUserLevelList;  //  사용자 등급 관리 리스트
                $scope.fn.makeTableConfigs = makeTableConfigs;  //  사용자 등급 관리 목록 테이블 설정
                $scope.fn.initSearch = initSearch;  //  검색 조건 초기화
                $scope.fn.initSearchUserLevel = initSearchUserLevel;  //  검색 조건 초기화
                $scope.fn.changePageRowCount = changePageRowCount;  //  업무 공간 참여 사용자 목록 보기 개수 변경
                $scope.fn.levelAdd = levelAdd;    //  등급 추가
                $scope.fn.removes = removes;    // 사용자 등급 삭제
                $scope.fn.listView = listView;    //  목록 화면으로 변경
                $scope.fn.modify = modify;    // 사용자 등급 수정
                /*  $scope.vm 상속 중  */
                $scope.vm.search = {
@@ -39,8 +38,8 @@
                };
                //  테이블 이벤트
                $scope.vm.tableEvent = {
                    modify : modify   //  업무 공간 참여하는 사용자의 참여 상태 변경
                $scope.tableEvent1 = {
                    modifyLevel : modifyLevel   //  업무 공간 참여하는 사용자의 참여 상태 변경
                };
                //  사용자 등급 리스트 불러오기
@@ -48,19 +47,8 @@
                    $scope.fn.getUserLevelList(0);
                });
                //  목록 화면으로 변경한다.
                function listView() {
                    $scope.vm.detailView = false;
                    //  이슈 테이블 설정
                    $scope.fn.makeTableConfigs();
                    var temp = angular.copy($scope.vm.responseData.data);
                    $scope.vm.responseData.data = angular.copy(temp);
                    //  마지막으로 보고있던 이슈 id를 초기화한다.
                    $rootScope.currentDetailIssueId = null;
                }
                //  사용자 등급 수정
                function modify(id) {
                function modifyLevel(id) {
                    $uibModal.open({
                        templateUrl : 'views/workspace/workspaceLevelModify.html',
                        size : "md",
@@ -137,7 +125,6 @@
                                            SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // 삭제 성공
                                        }, 100);
                                        $scope.fn.listView();
                                        $scope.fn.getUserLevelList(0);
                                    }
                                    else {
@@ -154,11 +141,14 @@
                //  검색 조건 초기화
                function initSearch() {
                    //$scope.vm.search.name = "";
                    //$scope.vm.search.account = "";
                    //$scope.vm.search.statuses = [];
                    $scope.fn.getUserWorkspaceList(0);
                function initSearchUserLevel() {
                    $scope.vm.search.levelName = "";
                    $scope.fn.getUserLevelList(0);
                }
                //  등급 목록 보기 개수 변경
                function changePageRowCount() {
                    $scope.fn.getUserLevelList(0);
                }
                //  사용자 등급 관리 테이블 설정
@@ -250,7 +240,7 @@
                    }
                    var conditions = {
                        name : $scope.vm.search.levelName //등급명
                        levelName : $scope.vm.search.levelName //등급명
                    };
                    //테이블 리스트 데이터 컨트롤러 요청
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -43,12 +43,12 @@
            //     });
            // },
            find : function (conditions) {
                return $http.post("userWorkspace/find", conditions).then(function (response) {
                return $http.post("userLevel/find", conditions).then(function (response) {
                    $log.debug("워크스페이스에 참여하는 전체 사용자 목록 : ", response);
                    return response;
                });
            },
            modify : function (conditions) {
            modifyLevel : function (conditions) {
                return $http.post("userLevel/modify", conditions).then(function (response) {
                    $log.debug("워크스페이스 참여자 참여 상태 변경 결과 : ", response);
                    return response;
src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -107,7 +107,7 @@
        <button type="button" class="btn btn-md btn-primary bold"
                js-short-cut
                js-short-cut-action="(fn.formCheck(levelAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit(vm.form)"
                ng-disabled="fn.formCheck(paymentAddForm.$invalid)"
                ng-disabled="fn.formCheck(levelAddForm.$invalid)"
                ng-click="fn.formSubmit(vm.form)"><span translate="common.save">저장</span>
        </button>
    </div>
src/main/webapp/views/workspace/workspaceLevelModify.html
@@ -32,72 +32,6 @@
                        </div>
                    </td>
                </tr>
                <!--tableColumnGenerator.dirextive.js 파일 참고-->
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageWorkspacePerm">워크스페이스 관리</span>
                    </td>
                    <td colspan="2">
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permWorkspaceSetting'><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageProjectPerm">프로젝트 관리</span>
                    </td>
                    <td colspan="2">
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permProjectSetting'><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageIssueSystemPerm">이슈 시스템 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permIssueSetting' ><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageUserPerm">사용자 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permUser'><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageNoticePerm">공지사항 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permNotice' ><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageFAQPerm">FAQ 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permFAQ' ><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageQnAPerm">QnA 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permQnA' ><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>
                    <td class="text-left bold">
                        <span translate="manageUser.manageGuidePerm">가이드 관리</span>
                    </td>
                    <td>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permGuide' ><span class='slider round'></span></label>
                    </td>
                </tr>
            </table>
        </form>
    </div>
src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -123,7 +123,7 @@
                        <div class="col-xl-11">
                            <div class="form-group form-buttons-w2">
                                <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
                                <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(0)">
                                    <i class="os-icon os-icon-ui-37"></i>
                                    &nbsp; &nbsp; <span translate="common.search">검색</span> &nbsp; &nbsp;
                                </button>
src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -7,17 +7,17 @@
                        <div class="col-xl-4">
                            <div class="form-group" style="margin-left: 50px">
                                <label translate="managementWorkspace.levelName">등급명</label>
                                <input class="form-control" type="text" ng-click="" ng-model="vm.search.level" maxlength="50">
                                <input class="form-control" type="text" ng-click="" ng-model="vm.search.levelName" maxlength="50">
                            </div>
                        </div>
                        <div class="col-xl-5">
                            <div class="form-group form-buttons-w2">
                                <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
                                <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(vm.page.selectedPage-1)">
                                    <i class="os-icon os-icon-ui-37"></i>
                                    &nbsp; &nbsp; <span translate="common.search">검색</span> &nbsp; &nbsp;
                                </button>
                                <button class="btn btn-xlg btn-white" ng-click="fn.initSearch()">
                                <button class="btn btn-xlg btn-white" ng-click="fn.initSearchUserLevel()">
                                    <i class="os-icon os-icon-grid-18"></i>
                                    &nbsp; &nbsp; <span translate="common.reset">초기화</span> &nbsp; &nbsp;
                                </button>
@@ -62,7 +62,7 @@
            <div class="table-responsive">
                <js-table data="vm.responseData.data" table-configs="vm.tableConfigs1"
                          event="vm.tableEvent"></js-table>
                          event="tableEvent1"></js-table>
            </div>
            <div class="controls-below-table text-center">
@@ -72,7 +72,7 @@
                    total-items="vm.responseData.page.totalCount"
                    ng-model="vm.page.selectedPage"
                    max-size="10"
                    ng-click="fn.getUserWorkspaceList(vm.page.selectedPage-1)"
                    ng-click="fn.getUserLevelList(vm.page.selectedPage-1)"
                    class="pagination pagination-sm"
                    previous-text="Prev"
                    next-text="Next"