From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 258 +++++++++++++++++++++++++++++++++------------------
1 files changed, 167 insertions(+), 91 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index a03d0c9..3a6a5a3 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -9,33 +9,21 @@
],
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 �긽�냽 以� */
- $scope.fn.getUserWorkspaceList = getUserWorkspaceList; // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 �젙蹂�
- $scope.fn.makeTableConfigs = makeTableConfigs; // �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
- $scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
- $scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
-
+ $scope.fn.getDepartmentList = getDepartmentList; // 遺��꽌 愿�由� 由ъ뒪�듃
+ $scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
+ $scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
+ $scope.fn.changeDepartmentPageRowCount = changeDepartmentPageRowCount;
+ $scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
+ $scope.fn.removeDepartments = removeDepartments; // 遺��꽌 �궘�젣
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
- name : "", // �씠由�
- account : "", // �씠硫붿씪
- statuses : [] // �긽�깭 - Y, N
- };
-
- $scope.vm.options = {
- statuses : [{
- fieldKey : "Y",
- fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
- }, {
- fieldKey : "N",
- //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
- fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
- }]
+ departmentName : "", // 遺��꽌紐�
};
$scope.vm.page = {
@@ -43,85 +31,66 @@
selectedPageRowCount : String(10)
};
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs2 = [];
$scope.vm.responseData = {
data : []
};
// �뀒�씠釉� �씠踰ㅽ듃
- $scope.vm.tableEvent = {
- modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ $scope.vm.tableEvent2 = {
+ departmentModify : departmentModify, //遺��꽌紐� 蹂�寃�
+ modifyDepartmentCount : modifyDepartmentCount //遺��꽌 ���썝 蹂�寃�
};
- // 寃곗젣 �긽�꽭 �젙蹂�
- $scope.$on("getUserWorkspaceList", function () {
- $scope.fn.getUserWorkspaceList(0);
+ // 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
+ $scope.$on("getDepartmentList", function () {
+ $scope.fn.getDepartmentList(0);
});
- // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- function modifyUserWorkspace(userWorkspace) {
- UserWorkspace.modify($resourceProvider.getContent(
- userWorkspace,
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- // �궡媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.findMyWorkspace();
- }
- else {
- userWorkspace.useYn = false;
- SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
- }
- });
- }
-
// 寃��깋 議곌굔 珥덇린�솕
- function initSearch() {
- $scope.vm.search.name = "";
- $scope.vm.search.account = "";
- $scope.vm.search.statuses = [];
- $scope.fn.getUserWorkspaceList(0);
+ function initSearchDepartment() {
+ $scope.vm.search.departmentName = "";
+ $scope.fn.getDepartmentList(0);
}
- // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
- function changePageRowCount() {
- $scope.fn.getUserWorkspaceList(0);
+ // 遺��꽌 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
+ function changeDepartmentPageRowCount() {
+ $scope.fn.getDepartmentList(0);
}
- // �뾽臾닿났媛� �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
+ // 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs2 = [];
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.name")
+ $scope.vm.tableConfigs2.push($tableProvider.config()
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs2.push($tableProvider.config()
+ .setHName("manageDepartment.departmentName")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("userName"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.email")
+ .setDName("departmentName")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_MODIFY"));
+ $scope.vm.tableConfigs2.push($tableProvider.config()
+ .setHName("manageDepartment.departmentEx")
+ .setHWidth("width-100-p bold")
+ .setDAlign("text-center")
+ .setDName("departmentDescription")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_EX"));
+ $scope.vm.tableConfigs2.push($tableProvider.config()
+ .setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("account"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.department")
- .setHWidth("width-120-p")
- .setDAlign("text-center")
- .setDName("department"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.level")
- .setHWidth("width-120-p")
- .setDAlign("text-center")
- .setDName("level"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("managementWorkspace.joinStatus")
- .setHWidth("width-140-p")
- .setDType("renderer")
- .setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
- .setDName("userYn")
- .setDRenderer("WORKSPACE_USE_YN"));
+ .setDName("departmentCount")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_COUNT"));
}
- // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶
- function getUserWorkspaceList(selectedPage) {
+ // 遺��꽌 愿�由� 紐⑸줉 議고쉶
+ function getDepartmentList(selectedPage) {
if (selectedPage < 0) {
selectedPage = 0;
}
@@ -137,33 +106,140 @@
}
var conditions = {
- name : $scope.vm.search.name,
- account : $scope.vm.search.account,
- statuses : (function () {
- var statuses = [];
-
- angular.forEach($scope.vm.search.statuses, function (status) {
- statuses.push(status.fieldKey);
- });
-
- return statuses;
- })(),
+ departmentName : $scope.vm.search.departmentName //遺��꽌紐�
};
- UserWorkspace.find($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;
+ /*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); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
+ }
+ });
+ }
+ // 遺��꽌 異붽�
+ function departmentAdd() {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentAdd.html',
+ size : "md",
+ controller : 'workspaceDepartmentAddController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ /*workspaceId : $scope.vm.workspaceVo.id,
+ usdKrw : $scope.vm.workspaceVo.usdKrw,
+ maxUser : $scope.vm.workspaceVo.maxUser*/
+ };
+ }
}
});
}
+ // 遺��꽌 �닔�젙
+ function departmentModify(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ size : "md",
+ controller : 'workspaceDepartmentModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
+ }
+
+ // 遺��꽌 �씤�썝 �닔�젙
+ function modifyDepartmentCount(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceDepartmentCountModify.html',
+ size : "md",
+ controller : 'departmentCountModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
+ }
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣 �뙘�뾽
+ function removeDepartments() {
+ 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")("managementWorkspace.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();
+
}
]);
}
--
Gitblit v1.8.0