From bea07d3ad5c832426680325f1112538feda04e50 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 09 11월 2021 10:08:43 +0900
Subject: [PATCH] ISP, Hosting 백엔드 추가 및 부서 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index d7cf0ac..59353a3 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") // "�깉�눜"
}]
};
@@ -47,6 +46,7 @@
};
$scope.vm.levels = [];
+ $scope.vm.departments = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -55,27 +55,7 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
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 () {
@@ -84,22 +64,6 @@
$scope.fn.makeTableConfigs();
$scope.fn.getUserWorkspaceList(0);
});
-
- // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- function modifyUserWorkspace(userWorkspace) {
- UserWorkspace.modify($resourceProvider.getContent(
- userWorkspace,
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- // �궡媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.findMyWorkspace();
- }
- else {
- userWorkspace.useYn = false;
- SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
- }
- });
- }
// 寃��깋 議곌굔 珥덇린�솕
function initSearch() {
@@ -211,8 +175,22 @@
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();
+ /*if(result.data.data[idx].departmentId == null){
+ data.departments = $scope.vm.departments.slice();
+ data.departments.unshift({
+ fieldKey : 'd',
+ fieldValue : '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.'
+ });
+ result.data.data[idx].departmentId = 'd';
+ } else{
+ data.departments = $scope.vm.departments.slice();
+ }*/
idx++;
});
}
@@ -239,7 +217,7 @@
});
}
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);
@@ -251,12 +229,12 @@
// 遺��꽌 紐⑸줉
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,
@@ -265,7 +243,7 @@
});
}
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);
@@ -273,6 +251,22 @@
return deferred.promise;
}
+
+ // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ function modifyUserWorkspace(userWorkspace) {
+ UserWorkspace.modify($resourceProvider.getContent(
+ userWorkspace,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ if (result.data.message.status === "success") {
+ // �궡媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.findMyWorkspace();
+ }
+ else {
+ userWorkspace.useYn = false;
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
+ }
+ });
+ }
}
]);
}
--
Gitblit v1.8.0