From a11dc4e377730f1ce08bc7210366c21e2833bf05 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 28 2월 2022 18:38:29 +0900
Subject: [PATCH] 1.0.5버전
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 59353a3..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 = {
@@ -45,6 +45,7 @@
selectedPageRowCount : String(10)
};
+ $scope.vm.managerYn = false;
$scope.vm.levels = [];
$scope.vm.departments = [];
$scope.vm.tableConfigs = [];
@@ -55,13 +56,16 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyUserDepartments : modifyUserDepartments //�궗�슜�옄 遺��꽌 蹂�寃�
};
+
+ 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);
});
@@ -99,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")
@@ -174,23 +177,13 @@
var idx = 0;
angular.forEach($scope.vm.responseData.data, function (data) {
- // data.levelId = $scope.vm.levels[idx].fieldKey;
- //data.department = $scope.vm.departments[idx];
-
+ if (data.managerYn === "Y") {
+ $scope.vm.managerYn = true;
+ }
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++;
});
}
@@ -267,6 +260,27 @@
}
});
}
+
+ // �궗�슜�옄媛� �냽�빐�엳�뒗 遺��꽌 �닔�젙 �뙘�뾽
+ 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