From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 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 b56f44d..49adc78 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('workspaceDepartmentConfigController', ['$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', '$timeout',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter, $timeout) {
/* $scope.fn �긽�냽 以� */
@@ -18,6 +18,7 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
+ $scope.fn.removes = removes; // 遺��꽌 �궘�젣
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -36,7 +37,8 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent2 = {
- modifyDepartment : modifyDepartment //遺��꽌紐� 蹂�寃�
+ departmentModify : departmentModify, //遺��꽌紐� 蹂�寃�
+ modifyDepartmentCount : modifyDepartmentCount //遺��꽌 ���썝 蹂�寃�
};
// 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
@@ -46,6 +48,7 @@
// 寃��깋 議곌굔 珥덇린�솕
function initSearchDepartment() {
+ $scope.vm.search.departmentName = "";
$scope.fn.getDepartmentList(0);
}
@@ -65,7 +68,7 @@
.setDType("renderer")
.setDRenderer("DEPARTMENT_MODIFY"));
$scope.vm.tableConfigs2.push($tableProvider.config()
- .setHName("manageDepartment.departmentDescription")
+ .setHName("manageDepartment.departmentEx")
.setHWidth("width-120-p")
.setDAlign("text-center")
.setDName("departmentDescription"));
@@ -73,7 +76,9 @@
.setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("departmentCount"));
+ .setDName("departmentCount")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_COUNT"));
}
// 遺��꽌 愿�由� 紐⑸줉 議고쉶
@@ -93,7 +98,7 @@
}
var conditions = {
- name : $scope.vm.search.departmentName //遺��꽌紐�
+ departmentName : $scope.vm.search.departmentName //遺��꽌紐�
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
@@ -102,10 +107,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); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
}
});
}
@@ -128,10 +136,10 @@
});
}
- // 遺��꽌紐� �닔�젙
- function modifyDepartment(id) {
+ // 遺��꽌 �닔�젙
+ function departmentModify(id) {
$uibModal.open({
- templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ templateUrl : 'views/workspace/departmentModify.html',
size : "md",
controller : 'departmentModifyController',
backdrop : 'static',
@@ -145,6 +153,83 @@
});
}
+ // 遺��꽌 �씤�썝 �닔�젙
+ function modifyDepartmentCount(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentCountModify.html',
+ size : "md",
+ controller : 'departmentCountModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
+ }
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣 �뙘�뾽
+ function removes() {
+ var removeIds = [];
+
+ angular.forEach($scope.vm.responseData.data, function (data) {
+ if (data.checked) {
+ removeIds.push(data.id);
+ }
+ });
+
+ if (removeIds.length < 1) {
+ SweetAlert.swal({
+ title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+ text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+ type : "warning"
+ });
+ return;
+ }
+
+ // �궘�젣 �븣由�
+ SweetAlert.swal({
+ title : $filter("translate")("managementWorkspace.deleteDepartment"), // "遺��꽌 �궘�젣"
+ text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.delete"), // �궘�젣
+ cancelButtonText : $filter("translate")("common.cancel"), // 痍⑥냼
+ closeOnConfirm : false,
+ closeOnCancel : true
+ },
+ function (isConfirm) {
+ SweetAlert.close();
+
+ if (isConfirm) {
+ $rootScope.spinner = true;
+
+ UserWorkspace.departmentRemove($resourceProvider.getContent(
+ { removeIds : removeIds },
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $timeout(function () {
+ SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // �궘�젣 �꽦怨�
+ }, 100);
+
+ $scope.fn.getDepartmentList(0);
+ }
+ else {
+ $timeout(function () {
+ SweetAlert.error($filter("translate")("common.deleteFailed"), result.data.message.message); // �궘�젣 �떎�뙣
+ }, 100);
+ }
+
+ $rootScope.spinner = false;
+ });
+ }
+ });
+ }
+
$scope.fn.makeTableConfigs();
$scope.fn.getDepartmentList();
--
Gitblit v1.8.0