From 8c71c843a0a7980446ce7de1e3d3e3eace960927 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 03 11월 2021 20:55:19 +0900
Subject: [PATCH] 사용자 등급 관리 프론트 수정
---
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 10 +-
src/main/webapp/views/workspace/workspaceLevelAdd.html | 2
src/main/webapp/views/workspace/workspaceUserConfig.html | 2
src/main/webapp/scripts/app/workspace/levelModify.controller.js | 35 +++++++++--
src/main/webapp/views/workspace/workspaceLevelModify.html | 66 ----------------------
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 2
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 38 ++++--------
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js | 4
8 files changed, 52 insertions(+), 107 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 398df12..f512ef3 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/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, '<') + "</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>";
diff --git a/src/main/webapp/scripts/app/workspace/levelModify.controller.js b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
index 9994975..1256ce0 100644
--- a/src/main/webapp/scripts/app/workspace/levelModify.controller.js
+++ b/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();
}]);
});
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index ac7a1ac..26d43b3 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/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 //�벑湲됰챸
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
diff --git a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
index 86dd39f..d07de9b 100644
--- a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
+++ b/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;
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index 671d995..e99c0c5 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/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>
diff --git a/src/main/webapp/views/workspace/workspaceLevelModify.html b/src/main/webapp/views/workspace/workspaceLevelModify.html
index 175c0ff..89492fd 100644
--- a/src/main/webapp/views/workspace/workspaceLevelModify.html
+++ b/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>
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 1abc8e9..c611a83 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/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>
<span translate="common.search">寃��깋</span>
</button>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 24ed4a8..894f8e3 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/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>
<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.initSearchUserLevel()">
<i class="os-icon os-icon-grid-18"></i>
<span translate="common.reset">珥덇린�솕</span>
</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"
--
Gitblit v1.8.0