From 58c96fb54e3e6bbf0c0df27e39eaff814f52e9d4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 01 11월 2021 13:54:42 +0900
Subject: [PATCH] 사용자등급관리, 부서관리 프론트 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 156 +++++++++++++++++++++++++++-------------------------
1 files changed, 81 insertions(+), 75 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 9245cbf..d91f13a 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -8,35 +8,22 @@
'angular'
],
function (app, angular) {
- app.controller('workspaceUserConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
- 'UserWorkspace', '$filter',
+ app.controller('workspaceUserLevelController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
+ 'UserWorkspace', 'Workspace', '$filter',
function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter) {
/* $scope.fn �긽�냽 以� */
- $scope.fn.getUserWorkspaceList = getUserWorkspaceList; // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 �젙蹂�
- $scope.fn.makeTableConfigs = makeTableConfigs; // �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
+ $scope.fn.getUserLevelList = getUserLevelList; // �궗�슜�옄 �벑湲� 愿�由� 由ъ뒪�듃
+ $scope.fn.makeTableConfigs = makeTableConfigs; // �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
- $scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
-
+ $scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
- name : "", // �씠由�
- account : "", // �씠硫붿씪
- statuses : [] // �긽�깭 - Y, N
+ levelName : "", // �벑湲됰챸
};
- $scope.vm.options = {
- statuses : [{
- fieldKey : "Y",
- fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
- }, {
- fieldKey : "N",
- //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
- fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- }]
- };
$scope.vm.page = {
selectedPage : 0,
@@ -50,78 +37,86 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
- modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ view : view
};
- // 寃곗젣 �긽�꽭 �젙蹂�
- $scope.$on("getUserWorkspaceList", function () {
- $scope.fn.getUserWorkspaceList(0);
+ // �궗�슜�옄 �벑湲� 由ъ뒪�듃 遺덈윭�삤湲�
+ $scope.$on("getUserLevelList", function () {
+ $scope.fn.getUserLevelList(0);
});
-
- // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- function modifyUserWorkspace(userWorkspace) {
- UserWorkspace.modify($resourceProvider.getContent(
- userWorkspace,
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- // �궡媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.findMyWorkspace();
- }
- else {
- userWorkspace.useYn = false;
- SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
- }
- });
- }
// 寃��깋 議곌굔 珥덇린�솕
function initSearch() {
- $scope.vm.search.name = "";
- $scope.vm.search.account = "";
- $scope.vm.search.statuses = [];
+ //$scope.vm.search.name = "";
+ //$scope.vm.search.account = "";
+ //$scope.vm.search.statuses = [];
$scope.fn.getUserWorkspaceList(0);
}
- // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
- function changePageRowCount() {
- $scope.fn.getUserWorkspaceList(0);
- }
-
- // �뾽臾닿났媛� �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
+ // �궗�슜�옄 �벑湲� 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.name")
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("managementWorkspace.levelName")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("userName"));
+ .setDName("levelName"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.email")
+ .setHName("manageUser.manageProjectPerm")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("account"));
+ .setDName("manageProject")
+ .setDRenderer("WORKSPACE_USE_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.department")
+ .setHName("manageUser.manageIssueSystemPerm")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("department"));
+ .setDName("IssueSystem")
+ .setDRenderer("WORKSPACE_USE_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.level")
+ .setHName("manageUser.manageUserPerm")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("level"));
+ .setDName("User")
+ .setDRenderer("WORKSPACE_USE_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("managementWorkspace.joinStatus")
+ .setHName("manageUser.manageNoticePerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
- .setDName("userYn")
+ .setDName("Notice")
+ .setDRenderer("WORKSPACE_USE_YN"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("manageUser.manageFAQPerm")
+ .setHWidth("width-140-p")
+ .setDType("renderer")
+ .setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
+ .setDName("FAQ")
+ .setDRenderer("WORKSPACE_USE_YN"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("manageUser.manageQnAPerm")
+ .setHWidth("width-140-p")
+ .setDType("renderer")
+ .setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
+ .setDName("QnA")
+ .setDRenderer("WORKSPACE_USE_YN"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("manageUser.manageGuidePerm")
+ .setHWidth("width-140-p")
+ .setDType("renderer")
+ .setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
+ .setDName("Guide")
.setDRenderer("WORKSPACE_USE_YN"));
}
- // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶
- function getUserWorkspaceList(selectedPage) {
+ // �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 議고쉶
+ function getUserLevelList(selectedPage) {
if (selectedPage < 0) {
selectedPage = 0;
}
@@ -136,21 +131,13 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name,
- account : $scope.vm.search.account,
- statuses : (function () {
- var statuses = [];
-
- angular.forEach($scope.vm.search.statuses, function (status) {
- statuses.push(status.fieldKey);
- });
-
- return statuses;
- })(),
+ var conditions = {
+ name : $scope.vm.search.levelName //�벑湲됰챸
};
-
- UserWorkspace.find($resourceProvider.getContent(conditions,
+
+ //�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
+ //UserWorkspace.findLevel($resourceProvider.getContent(conditions,
+ Workspace.levelFind($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
@@ -158,12 +145,31 @@
$scope.vm.responseData = result.data;
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+ }
+ // �벑湲� 異붽�
+ function levelAdd() {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceLevelAdd.html',
+ size : "md",
+ controller : 'workspaceLevelAddController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ // workspaceId : $scope.vm.workspaceVo.id,
+ // usdKrw : $scope.vm.workspaceVo.usdKrw,
+ // maxUser : $scope.vm.workspaceVo.maxUser
+ };
+ }
}
});
}
$scope.fn.makeTableConfigs();
+ $scope.fn.getUserLevelList();
}
]);
}
--
Gitblit v1.8.0