From 235dc86c096fcf06b0ff5d4ac31f754f44fc320e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 08 11월 2021 18:00:41 +0900
Subject: [PATCH] 업체 관리 백엔드 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 98 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index bf562b0..9da25a4 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -36,7 +36,6 @@
fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
}, {
fieldKey : "N",
- //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
}]
};
@@ -46,6 +45,8 @@
selectedPageRowCount : String(10)
};
+ $scope.vm.levels = [];
+ $scope.vm.departments = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -53,11 +54,52 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
- modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyLevel : modifyLevel, // �궗�슜�옄 �벑湲됰챸 蹂�寃�
+ departmentModify : departmentModify // 遺��꽌 蹂�寃�
};
- // 寃곗젣 �긽�꽭 �젙蹂�
+ // �궗�슜�옄 �벑湲� �닔�젙
+ 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.]
+ };
+ }
+ }
+ });
+ }
+
+ // 遺��꽌 �닔�젙
+ function departmentModify(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ size : "md",
+ controller : 'departmentModifyController',
+ 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);
});
@@ -82,7 +124,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);
}
@@ -156,6 +199,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,
@@ -164,6 +225,22 @@
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.department = $scope.vm.departments[idx];
+
+ data.levels = [];
+ data.departments = [];
+ data.levels = $scope.vm.levels.slice();
+ data.departments = $scope.vm.departments.slice();
+ idx++;
+ });
+ /*if(result.data.data[idx-1].departmentId == 0){
+ //console.log($scope.vm.tableConfigs);
+ //result.data.data[idx-1].department.fieldValue = '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.';
+ }*/
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -174,15 +251,21 @@
// �벑湲� 紐⑸줉
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") {
- $scope.vm.search.levels = result.data.data;
+ 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"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message, "error"); // �슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -191,18 +274,24 @@
return deferred.promise;
}
- // 遺��꽌 紐⑸줉
+ // 遺��꽌 紐⑸줉
function getDepartments() {
var deferred = $q.defer();
+ $scope.vm.departments = [];
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"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -210,9 +299,6 @@
return deferred.promise;
}
-
- // $scope.fn.makeTableConfigs();
- // $scope.fn.getUserWorkspaceList();
}
]);
}
--
Gitblit v1.8.0