From ac863ba662f9a200c2b13dc2e784afdbe92d1671 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 02 11월 2021 16:52:26 +0900
Subject: [PATCH] 사용자등급관리 프론트 수청
---
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 2
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 83 +++++++++++++++------------
src/main/webapp/views/workspace/workspaceUserConfig.html | 8 +-
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 39 +++++++------
4 files changed, 73 insertions(+), 59 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index f42ba5e..bf562b0 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -18,15 +18,16 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
-
+ $scope.fn.getLevels = getLevels; // �벑湲� 紐⑸줉 媛��졇�삤湲�
+ $scope.fn.getDepartments = getDepartments; // 遺��꽌 紐⑸줉 媛��졇�삤湲�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
name : "", // �씠由�
account : "", // �씠硫붿씪
statuses : [], // �긽�깭 - Y, N
- level : [], // �벑湲�
- departs : [] // 遺��꽌
+ levels : [], // �벑湲�
+ departments: [] // 遺��꽌
};
$scope.vm.options = {
@@ -37,38 +38,8 @@
fieldKey : "N",
//fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- }],
- levels : [{
- fieldKey : "S",
- //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
- fieldValue : "�뒋�띁 愿�由ъ옄"
- }, {
- fieldKey : "U",
- //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- fieldValue : "�궗�슜�옄"
- }],
- departs : [{
- fieldKey : "A",
- //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
- fieldValue : "媛쒕컻遺�"
- }, {
- fieldKey : "B",
- //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- fieldValue : "寃쎌쁺吏��썝遺�"
}]
};
-
- /*$scope.vm.options = {
- levels : [{
- fieldKey : "S",
- //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
- fieldValue : "�뒋�띁 愿�由ъ옄"
- }, {
- fieldKey : "U",
- //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- fieldValue : "�궗�슜�옄"
- }]
- };*/
$scope.vm.page = {
selectedPage : 0,
@@ -151,7 +122,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("managementWorkspace.joinStatus")
.setHWidth("width-140-p")
- .setDType("renderer")
+ .setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("userYn")
.setDRenderer("WORKSPACE_USE_YN"));
@@ -200,8 +171,48 @@
});
}
- $scope.fn.makeTableConfigs();
- $scope.fn.getUserWorkspaceList();
+ // �벑湲� 紐⑸줉
+ function getLevels() {
+ var deferred = $q.defer();
+
+ UserWorkspace.levelFind($resourceProvider.getContent({},
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.search.levels = 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();
+
+ 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;
+ }
+
+ // $scope.fn.makeTableConfigs();
+ // $scope.fn.getUserWorkspaceList();
}
]);
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index f78008e..827197b 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -30,7 +30,7 @@
selectedPageRowCount : String(10)
};
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs1 = [];
$scope.vm.responseData = {
data : []
};
@@ -55,63 +55,66 @@
// �궗�슜�옄 �벑湲� 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs1 = [];
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("managementWorkspace.levelName")
.setHWidth("width-120-p")
.setDAlign("text-center")
.setDName("levelName"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageProjectPerm")
.setHWidth("width-120-p")
+ .setDType("renderer")
.setDAlign("text-center")
.setDName("manageProject")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("PROJECT_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageIssueSystemPerm")
.setHWidth("width-120-p")
+ .setDType("renderer")
.setDAlign("text-center")
.setDName("IssueSystem")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("ISSUE_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageUserPerm")
.setHWidth("width-120-p")
+ .setDType("renderer")
.setDAlign("text-center")
.setDName("User")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("USER_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageNoticePerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("Notice")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("NOTICE_PERM_YN"));
+ $scope.vm.tableConfigs1.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()
+ .setDRenderer("FAQ_PERM_YN"));
+ $scope.vm.tableConfigs1.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()
+ .setDRenderer("QNA_PERM_YN"));
+ $scope.vm.tableConfigs1.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"));
+ .setDRenderer("GUIDE_PERM_YN"));
}
// �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 議고쉶
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 8de14c3..1abc8e9 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -83,7 +83,7 @@
<div class="col-xl-2">
<div class="form-group">
- <label translate="common.status">�긽�깭</label>
+ <label translate="common.status">李몄뿬 �긽�깭</label>
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="statuses"
selected-model="vm.search.statuses"
@@ -105,12 +105,12 @@
<div class="col-xl-3">
<div class="form-group">
- <label>遺��꽌紐�</label>
+ <label>遺��꽌</label>
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="depart"
- selected-model="vm.search.departs"
+ selected-model="vm.search.departments"
extra-settings="{ stringTypeOption : true }"
- options="vm.options.departs"></ng-dropdown-multiselect>
+ options="vm.options.departments"></ng-dropdown-multiselect>
</div>
</div>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index e87fc8b..2cd37bd 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -106,7 +106,7 @@
</div>-->
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
+ <js-table data="vm.responseData.data" table-configs="vm.tableConfigs1"
event="vm.tableEvent"></js-table>
</div>
--
Gitblit v1.8.0