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/workspaceDepartmentConfig.controller.js | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 1b2a39b..3a6a5a3 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -17,8 +17,9 @@
$scope.fn.getDepartmentList = getDepartmentList; // 遺��꽌 愿�由� 由ъ뒪�듃
$scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
+ $scope.fn.changeDepartmentPageRowCount = changeDepartmentPageRowCount;
$scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
- $scope.fn.removes = removes; // 遺��꽌 �궘�젣
+ $scope.fn.removeDepartments = removeDepartments; // 遺��꽌 �궘�젣
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -52,6 +53,11 @@
$scope.fn.getDepartmentList(0);
}
+ // 遺��꽌 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
+ function changeDepartmentPageRowCount() {
+ $scope.fn.getDepartmentList(0);
+ }
+
// 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs2 = [];
@@ -69,9 +75,11 @@
.setDRenderer("DEPARTMENT_MODIFY"));
$scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentEx")
- .setHWidth("width-120-p")
+ .setHWidth("width-100-p bold")
.setDAlign("text-center")
- .setDName("departmentDescription"));
+ .setDName("departmentDescription")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_EX"));
$scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
@@ -107,11 +115,13 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
+ /*if(result.data.data[0].id == 1){
+ result.data.data.shift();
+ }*/
$scope.vm.responseData = result.data;
-
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
}
});
}
@@ -139,7 +149,7 @@
$uibModal.open({
templateUrl : 'views/workspace/workspaceDepartmentModify.html',
size : "md",
- controller : 'departmentModifyController',
+ controller : 'workspaceDepartmentModifyController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -169,7 +179,7 @@
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣 �뙘�뾽
- function removes() {
+ function removeDepartments() {
var removeIds = [];
angular.forEach($scope.vm.responseData.data, function (data) {
@@ -189,8 +199,8 @@
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("customField.deleteUserDefinedFields"), // "�궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣"
- text : $filter("translate")("customField.wantToDeleteSelectUserDefinedFields"), // "�꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ title : $filter("translate")("managementWorkspace.deleteDepartment"), // "遺��꽌 �궘�젣"
+ text : $filter("translate")("managementWorkspace.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -229,7 +239,6 @@
}
$scope.fn.makeTableConfigs();
- $scope.fn.getDepartmentList();
}
]);
--
Gitblit v1.8.0