src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -328,6 +328,19 @@ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permGuide' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>"; break; case "DEPARTMENT_OPTION" : makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change=''><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>"; break; case "LEVEL_OPTION" : //makeTag += "<select class='form-control input-sm' ng-model='data.levels[0].id' ng-options='levelName.id as levelName.levelName for levelName in data.levels' ></select>"; makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change=''><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>"; break; case "WORKSPACE_USE_YN" : makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>"; break; case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" : var values = [];
@@ -74,7 +74,7 @@ //description : $rootScope.preventXss($scope.vm.form.description) }; UserWorkspace.modifyLevel($resourceProvider.getContent(condition, UserWorkspace.levelModify($resourceProvider.getContent(condition, content, $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -16,7 +16,7 @@ /* $scope.fn 상속 중 */ $scope.fn.getDepartmentList = getDepartmentList; // 부서 관리 리스트 $scope.fn.makeTableConfigs = makeTableConfigs; // 부서 관리 목록 테이블 설정 $scope.fn.initSearch = initSearch; // 검색 조건 초기화 $scope.fn.initSearchDepartment = initSearchDepartment; // 검색 조건 초기화 $scope.fn.departmentAdd = departmentAdd; // 부서 추가 /* $scope.vm 상속 중 */ @@ -45,8 +45,8 @@ }); // 검색 조건 초기화 function initSearch() { $scope.fn.getUserWorkspaceList(0); function initSearchDepartment() { $scope.fn.getDepartmentList(0); } // 부서 관리 테이블 설정 src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -19,7 +19,7 @@ $scope.fn.initSearch = initSearch; // 검색 조건 초기화 $scope.fn.changePageRowCount = changePageRowCount; // 업무 공간 참여 사용자 목록 보기 개수 변경 $scope.fn.getLevels = getLevels; // 등급 목록 가져오기 // $scope.fn.getDepartments = getDepartments; // 부서 목록 가져오기 $scope.fn.getDepartments = getDepartments; // 부서 목록 가져오기 /* $scope.vm 상속 중 */ $scope.vm.search = { @@ -46,6 +46,7 @@ selectedPageRowCount : String(10) }; $scope.vm.levels = []; $scope.vm.tableConfigs = []; $scope.vm.responseData = { data : [] @@ -53,11 +54,34 @@ // 테이블 이벤트 $scope.vm.tableEvent = { modifyUserWorkspace : modifyUserWorkspace // 업무 공간 참여하는 사용자의 참여 상태 변경 modifyUserWorkspace : modifyUserWorkspace, // 업무 공간 참여하는 사용자의 참여 상태 변경 modifyLevel : modifyLevel, // 사용자 등급명 변경 //modifyDepartment : modifyDepartment // 부서 변경 }; // 사용자 등급 수정 function modifyLevel(id) { $uibModal.open({ templateUrl : 'views/workspace/workspaceLevelModify.html', size : "md", controller : 'levelModifyController', backdrop : 'static', resolve : { parameter : function () { return { id : id, //levelName : [$scope.vm.form.] }; } } }); } // 상세 정보 $scope.$on("getUserWorkspaceList", function () { $scope.fn.getLevels(); $scope.fn.getDepartments(); $scope.fn.makeTableConfigs(); $scope.fn.getUserWorkspaceList(0); }); @@ -82,7 +106,8 @@ $scope.vm.search.name = ""; $scope.vm.search.account = ""; $scope.vm.search.statuses = []; $scope.vm.search.level = []; $scope.vm.search.levels = []; $scope.vm.search.departments = []; $scope.fn.getUserWorkspaceList(0); } @@ -156,6 +181,24 @@ return statuses; })(), levels : (function () { var levels = []; angular.forEach($scope.vm.search.levels, function (level) { levels.push(level.fieldKey); }); return levels; })(), departments : (function () { var departments = []; angular.forEach($scope.vm.search.departments, function (department) { departments.push(department.fieldKey); }); return departments; })(), }; UserWorkspace.find($resourceProvider.getContent(conditions, @@ -164,6 +207,14 @@ if (result.data.message.status === "success") { $scope.vm.page.selectedPage = currentPage + 1; $scope.vm.responseData = result.data; var idx = 0; angular.forEach($scope.vm.responseData.data, function (data) { data.levelId = 3; /*$scope.vm.levels[idx].id;*/ data.levels = []; data.levels = $scope.vm.levels.slice(); idx++; }); } else { SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "업무 공간 전체 사용자 목록 조회 실패" @@ -174,12 +225,19 @@ // 등급 목록 function getLevels() { var deferred = $q.defer(); $scope.vm.levels = []; UserWorkspace.levelFind($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 1000))).then(function (result) { if (result.data.message.status === "success") { $scope.vm.search.levels = result.data.data; angular.forEach(result.data.data, function (level) { $scope.vm.levels.push({ fieldKey : level.id, fieldValue : level.levelName }); }); } else { SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // 업무 공간 전체 사용자 목록 조회 실패 @@ -191,28 +249,31 @@ return deferred.promise; } // 부서 목록 // function getDepartments() { // var deferred = $q.defer(); // // UserWorkspace.departmentFind($resourceProvider.getContent({}, // $resourceProvider.getPageContent(0, 1000))).then(function (result) { // // if (result.data.message.status === "success") { // $scope.vm.search.departments = result.data.data; // } // else { // SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // 업무 공간 전체 사용자 목록 조회 실패 // } // // deferred.resolve(result.data.data); // }); // // return deferred.promise; // } // 부서 목록 function getDepartments() { var deferred = $q.defer(); $scope.fn.makeTableConfigs(); $scope.fn.getUserWorkspaceList(); UserWorkspace.departmentFind($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 1000))).then(function (result) { if (result.data.message.status === "success") { $scope.vm.search.departments = result.data.data; angular.forEach(result.data.data, function (department) { $scope.vm.departments.push({ fieldKey : department.id, fieldValue : department.departmentName }); }); } else { SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // 업무 공간 전체 사용자 목록 조회 실패 } deferred.resolve(result.data.data); }); return deferred.promise; } } ]); } src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -22,6 +22,7 @@ $scope.fn.removes = removes; // 사용자 등급 삭제 $scope.fn.makeSearchConditions = makeSearchConditions; /* $scope.vm 상속 중 */ $scope.vm.search = { levelName : "", // 등급명 src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -30,18 +30,18 @@ return response; }); }, // departmentFind : function (conditions) { // return $http.post("userWorkspace/departmentFind", conditions).then(function (response) { // $log.debug("부서 목록 : ", response); // return response; // }); // }, // departmentAdd : function (conditions) { // return $http.post("userWorkspace/departmentAdd", conditions).then(function (response) { // $log.debug("부서 생성 결과 : ", response); // return response; // }); // }, departmentFind : function (conditions) { return $http.post("userWorkspace/departmentFind", conditions).then(function (response) { $log.debug("부서 목록 : ", response); return response; }); }, departmentAdd : function (conditions) { return $http.post("userWorkspace/departmentAdd", conditions).then(function (response) { $log.debug("부서 생성 결과 : ", response); return response; }); }, find : function (conditions) { return $http.post("userWorkspace/find", conditions).then(function (response) { $log.debug("워크스페이스에 참여하는 전체 사용자 목록 : ", response); @@ -53,7 +53,13 @@ $log.debug("사용자 등급 권한 변경 결과 : ", response); return response; }); } }, modify : function (conditions) { return $http.post("userWorkspace/modify", conditions).then(function (response) { $log.debug("참여 상태 수정 결과 : ", response); return response; }); }, } } ]) src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -83,11 +83,11 @@ <div class="col-xl-4"> <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.getDepartmentList(0)"> <i class="os-icon os-icon-ui-37"></i> <span translate="common.search">검색</span> </button> <button class="btn btn-xlg btn-white" ng-click="fn.initSearch()"> <button class="btn btn-xlg btn-white" ng-click="fn.initSearchDepartment()"> <i class="os-icon os-icon-grid-18"></i> <span translate="common.reset">초기화</span> </button> src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -59,7 +59,7 @@ </tr> <tr> <td class="text-left bold"> <span translate="manageUser.manageUserPerm">사용자 관리</span> <span translate="manageUser.manageApiPerm">API 관리</span> </td> <td> <label class='switch'><input type='checkbox' ng-model='vm.form.permApi'><span class='slider round'></span></label> src/main/webapp/views/workspace/workspaceLevelModify.html
@@ -1,7 +1,7 @@ <div class="formModal"> <div class="modal-header faded smaller"> <div class="modal-title"> <strong>등급 수정</strong> <strong>등급명 수정</strong> </div> <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()"> <span aria-hidden="true"> ×</span> @@ -9,7 +9,7 @@ </div> <div class="modal-body"> <form role="form" name="levelAddForm"> <form role="form" name="levelModifyForm"> <table class="table table-lightborder"> <tr> <td> @@ -40,8 +40,8 @@ <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">취소</span></button> <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)" js-short-cut-action="(fn.formCheck(levelModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit(vm.form)" ng-disabled="fn.formCheck(levelModifyForm.$invalid)" ng-click="fn.formSubmit(vm.form)"><span translate="common.save">저장</span> </button> </div> src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -97,9 +97,8 @@ <label>등급</label> <ng-dropdown-multiselect class="multiSelect cursor" data-input-name="levels" selected-model="vm.search.levels" extra-settings="{ stringTypeOption : true }" options="vm.options.levels"></ng-dropdown-multiselect> selected-model="vm.search.levels.levelName" options="vm.levels"></ng-dropdown-multiselect> </div> </div> @@ -107,10 +106,9 @@ <div class="form-group"> <label>부서</label> <ng-dropdown-multiselect class="multiSelect cursor" data-input-name="depart" data-input-name="departments" selected-model="vm.search.departments" extra-settings="{ stringTypeOption : true }" options="vm.options.departments"></ng-dropdown-multiselect> options="::vm.departments"></ng-dropdown-multiselect> </div> </div> @@ -123,7 +121,7 @@ <div class="col-xl-11"> <div class="form-group form-buttons-w2"> <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(0)"> <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)"> <i class="os-icon os-icon-ui-37"></i> <span translate="common.search">검색</span> </button>
