From 30c4906a7f2db197074c268c0989200e74b4b367 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 토, 19 2월 2022 18:06:32 +0900
Subject: [PATCH] - 사용자정의필드 컬럼 정렬 진행중
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 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..a9f1527 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('workspaceUserConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
- 'UserWorkspace', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter) {
+ 'UserWorkspace', '$filter', '$injector', '$controller',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter, $injector, $controller) {
/* $scope.fn �긽�냽 以� */
@@ -27,7 +27,7 @@
account : "", // �씠硫붿씪
statuses : [], // �긽�깭 - Y, N
levels : [], // �벑湲�
- departments: [] // 遺��꽌
+ departments: [], // 遺��꽌
};
$scope.vm.options = {
@@ -36,7 +36,6 @@
fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
}, {
fieldKey : "N",
- //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
}]
};
@@ -46,7 +45,9 @@
selectedPageRowCount : String(10)
};
+ $scope.vm.managerYn = false;
$scope.vm.levels = [];
+ $scope.vm.departments = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -55,51 +56,18 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- modifyLevel : modifyLevel, // �궗�슜�옄 �벑湲됰챸 蹂�寃�
- //modifyDepartment : modifyDepartment // 遺��꽌 蹂�寃�
+ modifyUserDepartments : modifyUserDepartments //�궗�슜�옄 遺��꽌 蹂�寃�
};
- // �궗�슜�옄 �벑湲� �닔�젙
- 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.]
- };
- }
- }
- });
- }
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �긽�꽭 �젙蹂�
$scope.$on("getUserWorkspaceList", function () {
$scope.fn.getLevels();
$scope.fn.getDepartments();
- $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() {
@@ -135,8 +103,7 @@
.setHWidth("width-120-p")
.setDAlign("text-center")
.setDType("renderer")
- .setDName("department")
- .setDRenderer("DEPARTMENT_OPTION"));
+ .setDRenderer("USE_DEPARTMENT_LIST"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.level")
.setHWidth("width-120-p")
@@ -210,9 +177,13 @@
var idx = 0;
angular.forEach($scope.vm.responseData.data, function (data) {
- // data.levelId = $scope.vm.levels[idx].fieldKey;
+ if (data.managerYn === "Y") {
+ $scope.vm.managerYn = true;
+ }
data.levels = [];
+ data.departments = [];
data.levels = $scope.vm.levels.slice();
+ data.departments = $scope.vm.departments.slice();
idx++;
});
}
@@ -239,7 +210,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 +222,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 +236,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 +244,43 @@
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); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
+ }
+ });
+ }
+
+ // �궗�슜�옄媛� �냽�빐�엳�뒗 遺��꽌 �닔�젙 �뙘�뾽
+ function modifyUserDepartments(id, userId) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceUserDepartmentModify.html',
+ size : "md",
+ controller : 'workspaceUserDepartmentModifyController',
+ backdrop : 'static',
+ windowClass : 'workflow-window',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ userId : userId
+ };
+ }
+ }
+ });
+ }
+
+ $scope.fn.makeTableConfigs();
}
]);
}
--
Gitblit v1.8.0