From 8e538d93ca3f8da8d082ad2ee497625349d9a4dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 05 11월 2021 17:00:19 +0900
Subject: [PATCH] 부서관리 백엔드 수정
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 1274e8e..f3e4d98 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -16,7 +16,7 @@
/* $scope.fn �긽�냽 以� */
$scope.fn.getDepartmentList = getDepartmentList; // 遺��꽌 愿�由� 由ъ뒪�듃
$scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
- $scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
+ $scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
/* $scope.vm �긽�냽 以� */
@@ -29,15 +29,14 @@
selectedPageRowCount : String(10)
};
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs2 = [];
$scope.vm.responseData = {
data : []
};
// �뀒�씠釉� �씠踰ㅽ듃
- $scope.vm.tableEvent = {
- // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- view : view
+ $scope.vm.tableEvent2 = {
+ modifyDepartment : modifyDepartment //遺��꽌紐� 蹂�寃�
};
// 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
@@ -46,33 +45,35 @@
});
// 寃��깋 議곌굔 珥덇린�솕
- function initSearch() {
- $scope.fn.getUserWorkspaceList(0);
+ function initSearchDepartment() {
+ $scope.fn.getDepartmentList(0);
}
// 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs2 = [];
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentName")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("levelName"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDName("departmentName")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_MODIFY"));
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentEx")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("manageProject"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDName("departmentDescription"));
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("IssueSystem"));
+ .setDName("departmentCount"));
}
// 遺��꽌 愿�由� 紐⑸줉 議고쉶
@@ -96,13 +97,13 @@
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
- //UserWorkspace.findDepartment($resourceProvider.getContent(conditions,
UserWorkspace.departmentFind($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
$scope.vm.responseData = result.data;
+
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -127,6 +128,24 @@
}
});
}
+
+ // 遺��꽌紐� �닔�젙
+ function modifyDepartment(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ size : "md",
+ controller : 'departmentModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
+ }
+
$scope.fn.makeTableConfigs();
$scope.fn.getDepartmentList();
--
Gitblit v1.8.0