From f2b3cbd3a0639f55eef38a4e90ad52ef8e63b1c1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 20:24:32 +0900
Subject: [PATCH] "사용자 관리" 프론트 수정 완료!
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 110 insertions(+), 39 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..d7cf0ac 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,44 +38,15 @@
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,
selectedPageRowCount : String(10)
};
+ $scope.vm.levels = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -82,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);
});
@@ -111,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);
}
@@ -151,7 +147,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"));
@@ -185,6 +181,24 @@
return statuses;
})(),
+ levelIds : (function () {
+ var levels = [];
+
+ angular.forEach($scope.vm.search.levels, function (level) {
+ levels.push(level.fieldKey);
+ });
+
+ return levels;
+ })(),
+ departmentIds : (function () {
+ var departments = [];
+
+ angular.forEach($scope.vm.search.departments, function (department) {
+ departments.push(department.fieldKey);
+ });
+
+ return departments;
+ })(),
};
UserWorkspace.find($resourceProvider.getContent(conditions,
@@ -193,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 = $scope.vm.levels[idx].fieldKey;
+ data.levels = [];
+ data.levels = $scope.vm.levels.slice();
+ idx++;
+ });
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -200,8 +222,57 @@
});
}
- $scope.fn.makeTableConfigs();
- $scope.fn.getUserWorkspaceList();
+ // �벑湲� 紐⑸줉
+ 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") {
+ 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"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ 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;
+ 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;
+ }
}
]);
}
--
Gitblit v1.8.0