From 5df33661fc5d9366bd25e769e90caf0255edc95c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 03 11월 2021 14:33:58 +0900
Subject: [PATCH] - 사용자 등급관리 findByLevelId 파라미터 Name 변경 - 사용자 삭제 알림 명칭 지정 추가
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 9245cbf..3f5130c 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -18,13 +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
+ statuses : [], // �긽�깭 - Y, N
+ levels : [], // �벑湲�
+ departments: [] // 遺��꽌
};
$scope.vm.options = {
@@ -79,6 +82,7 @@
$scope.vm.search.name = "";
$scope.vm.search.account = "";
$scope.vm.search.statuses = [];
+ $scope.vm.search.level = [];
$scope.fn.getUserWorkspaceList(0);
}
@@ -105,16 +109,20 @@
.setHName("common.department")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("department"));
+ .setDType("renderer")
+ .setDName("department")
+ .setDRenderer("DEPARTMENT_OPTION"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.level")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("level"));
+ .setDType("renderer")
+ .setDName("level")
+ .setDRenderer("LEVEL_OPTION"));
$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"));
@@ -163,7 +171,48 @@
});
}
+ // �벑湲� 紐⑸줉
+ 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();
}
]);
}
--
Gitblit v1.8.0