From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:55:10 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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..9e98603 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,7 +29,7 @@
selectedPageRowCount : String(10)
};
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs2 = [];
$scope.vm.responseData = {
data : []
};
@@ -37,7 +37,6 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
// modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- view : view
};
// 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
@@ -46,29 +45,29 @@
});
// 寃��깋 議곌굔 珥덇린�솕
- 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()
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentEx")
.setHWidth("width-120-p")
.setDAlign("text-center")
.setDName("manageProject"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
.setDAlign("text-center")
@@ -96,18 +95,17 @@
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
- //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); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
- }
- });
+ // 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); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
+ // }
+ // });
}
// 遺��꽌 異붽�
function departmentAdd() {
--
Gitblit v1.8.0