From 58c96fb54e3e6bbf0c0df27e39eaff814f52e9d4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 01 11월 2021 13:54:42 +0900
Subject: [PATCH] 사용자등급관리, 부서관리 프론트 수정
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 126 +++++++++++++++--------------------------
1 files changed, 46 insertions(+), 80 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..1274e8e 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -14,28 +14,14 @@
/* $scope.fn �긽�냽 以� */
- $scope.fn.getUserWorkspaceList = getUserWorkspaceList; // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 �젙蹂�
- $scope.fn.makeTableConfigs = makeTableConfigs; // �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
+ $scope.fn.getDepartmentList = getDepartmentList; // 遺��꽌 愿�由� 由ъ뒪�듃
+ $scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
- $scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
-
+ $scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
/* $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 = {
@@ -50,78 +36,47 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
- modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ view : view
};
- // 寃곗젣 �긽�꽭 �젙蹂�
- $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 changePageRowCount() {
- $scope.fn.getUserWorkspaceList(0);
- }
-
- // �뾽臾닿났媛� �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
+ // 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.name")
+ .setDType("checkbox")
+ .setHWidth("width-20-p")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("manageDepartment.departmentName")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("userName"));
+ .setDName("levelName"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.email")
+ .setHName("manageDepartment.departmentEx")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("account"));
+ .setDName("manageProject"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.department")
+ .setHName("manageDepartment.departmentCount")
.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("IssueSystem"));
}
- // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶
- function getUserWorkspaceList(selectedPage) {
+ // 遺��꽌 愿�由� 紐⑸줉 議고쉶
+ function getDepartmentList(selectedPage) {
if (selectedPage < 0) {
selectedPage = 0;
}
@@ -137,20 +92,12 @@
}
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;
- })(),
+ name : $scope.vm.search.departmentName //遺��꽌紐�
};
- UserWorkspace.find($resourceProvider.getContent(conditions,
+ //�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
+ //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") {
@@ -162,8 +109,27 @@
}
});
}
-
+ // 遺��꽌 異붽�
+ 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*/
+ };
+ }
+ }
+ });
+ }
$scope.fn.makeTableConfigs();
+ $scope.fn.getDepartmentList();
+
}
]);
}
--
Gitblit v1.8.0