From 2a0ad29f00b70e7a4576c6c870d10a894615b201 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:29:32 +0900
Subject: [PATCH] "사용자 관리" 프론트 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 109 +++++++++++++++++++++------
src/main/webapp/views/workspace/workspaceLevelAdd.html | 2
src/main/webapp/views/workspace/workspaceUserConfig.html | 12 +-
src/main/webapp/scripts/app/workspace/levelModify.controller.js | 2
src/main/webapp/views/workspace/workspaceLevelModify.html | 8 +-
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 13 +++
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 6
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 1
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js | 32 ++++---
src/main/webapp/views/workspace/workspaceDepartmentConfig.html | 4
10 files changed, 134 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index b91b7b3..1546743 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -328,6 +328,19 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permGuide' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
+ case "DEPARTMENT_OPTION" :
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change=''><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ break;
+
+ case "LEVEL_OPTION" :
+ //makeTag += "<select class='form-control input-sm' ng-model='data.levels[0].id' ng-options='levelName.id as levelName.levelName for levelName in data.levels' ></select>";
+ makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change=''><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ break;
+
+ case "WORKSPACE_USE_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ break;
+
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
var values = [];
diff --git a/src/main/webapp/scripts/app/workspace/levelModify.controller.js b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
index 767b821..5dc37d5 100644
--- a/src/main/webapp/scripts/app/workspace/levelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
@@ -74,7 +74,7 @@
//description : $rootScope.preventXss($scope.vm.form.description)
};
- UserWorkspace.modifyLevel($resourceProvider.getContent(condition,
+ UserWorkspace.levelModify($resourceProvider.getContent(condition,
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 0cb8031..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 �긽�냽 以� */
@@ -45,8 +45,8 @@
});
// 寃��깋 議곌굔 珥덇린�솕
- function initSearch() {
- $scope.fn.getUserWorkspaceList(0);
+ function initSearchDepartment() {
+ $scope.fn.getDepartmentList(0);
}
// 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 2b2852d..51cd538 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -19,7 +19,7 @@
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
$scope.fn.getLevels = getLevels; // �벑湲� 紐⑸줉 媛��졇�삤湲�
- // $scope.fn.getDepartments = getDepartments; // 遺��꽌 紐⑸줉 媛��졇�삤湲�
+ $scope.fn.getDepartments = getDepartments; // 遺��꽌 紐⑸줉 媛��졇�삤湲�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -46,6 +46,7 @@
selectedPageRowCount : String(10)
};
+ $scope.vm.levels = [];
$scope.vm.tableConfigs = [];
$scope.vm.responseData = {
data : []
@@ -53,11 +54,34 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
- modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyLevel : modifyLevel, // �궗�슜�옄 �벑湲됰챸 蹂�寃�
+ //modifyDepartment : modifyDepartment // 遺��꽌 蹂�寃�
};
+
+ // �궗�슜�옄 �벑湲� �닔�젙
+ function modifyLevel(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceLevelModify.html',
+ size : "md",
+ controller : 'levelModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ //levelName : [$scope.vm.form.]
+ };
+ }
+ }
+ });
+ }
// �긽�꽭 �젙蹂�
$scope.$on("getUserWorkspaceList", function () {
+ $scope.fn.getLevels();
+ $scope.fn.getDepartments();
+ $scope.fn.makeTableConfigs();
$scope.fn.getUserWorkspaceList(0);
});
@@ -82,7 +106,8 @@
$scope.vm.search.name = "";
$scope.vm.search.account = "";
$scope.vm.search.statuses = [];
- $scope.vm.search.level = [];
+ $scope.vm.search.levels = [];
+ $scope.vm.search.departments = [];
$scope.fn.getUserWorkspaceList(0);
}
@@ -156,6 +181,24 @@
return statuses;
})(),
+ levels : (function () {
+ var levels = [];
+
+ angular.forEach($scope.vm.search.levels, function (level) {
+ levels.push(level.fieldKey);
+ });
+
+ return levels;
+ })(),
+ departments : (function () {
+ var departments = [];
+
+ angular.forEach($scope.vm.search.departments, function (department) {
+ departments.push(department.fieldKey);
+ });
+
+ return departments;
+ })(),
};
UserWorkspace.find($resourceProvider.getContent(conditions,
@@ -164,6 +207,14 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
$scope.vm.responseData = result.data;
+
+ var idx = 0;
+ angular.forEach($scope.vm.responseData.data, function (data) {
+ data.levelId = 3; /*$scope.vm.levels[idx].id;*/
+ data.levels = [];
+ data.levels = $scope.vm.levels.slice();
+ idx++;
+ });
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -174,12 +225,19 @@
// �벑湲� 紐⑸줉
function getLevels() {
var deferred = $q.defer();
+ $scope.vm.levels = [];
UserWorkspace.levelFind($resourceProvider.getContent({},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
$scope.vm.search.levels = result.data.data;
+ angular.forEach(result.data.data, function (level) {
+ $scope.vm.levels.push({
+ fieldKey : level.id,
+ fieldValue : level.levelName
+ });
+ });
}
else {
SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
@@ -191,28 +249,31 @@
return deferred.promise;
}
- // 遺��꽌 紐⑸줉
- // function getDepartments() {
- // var deferred = $q.defer();
- //
- // UserWorkspace.departmentFind($resourceProvider.getContent({},
- // $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- //
- // if (result.data.message.status === "success") {
- // $scope.vm.search.departments = result.data.data;
- // }
- // else {
- // SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
- // }
- //
- // deferred.resolve(result.data.data);
- // });
- //
- // return deferred.promise;
- // }
+ // 遺��꽌 紐⑸줉
+ function getDepartments() {
+ var deferred = $q.defer();
- $scope.fn.makeTableConfigs();
- $scope.fn.getUserWorkspaceList();
+ UserWorkspace.departmentFind($resourceProvider.getContent({},
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.search.departments = result.data.data;
+ angular.forEach(result.data.data, function (department) {
+ $scope.vm.departments.push({
+ fieldKey : department.id,
+ fieldValue : department.departmentName
+ });
+ });
+ }
+ else {
+ SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
+
+ return deferred.promise;
+ }
}
]);
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 3bbfcb1..40855c9 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -22,6 +22,7 @@
$scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
$scope.fn.makeSearchConditions = makeSearchConditions;
+
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
levelName : "", // �벑湲됰챸
diff --git a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
index 8fa8540..ad1614b 100644
--- a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
+++ b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -30,18 +30,18 @@
return response;
});
},
- // departmentFind : function (conditions) {
- // return $http.post("userWorkspace/departmentFind", conditions).then(function (response) {
- // $log.debug("遺��꽌 紐⑸줉 : ", response);
- // return response;
- // });
- // },
- // departmentAdd : function (conditions) {
- // return $http.post("userWorkspace/departmentAdd", conditions).then(function (response) {
- // $log.debug("遺��꽌 �깮�꽦 寃곌낵 : ", response);
- // return response;
- // });
- // },
+ departmentFind : function (conditions) {
+ return $http.post("userWorkspace/departmentFind", conditions).then(function (response) {
+ $log.debug("遺��꽌 紐⑸줉 : ", response);
+ return response;
+ });
+ },
+ departmentAdd : function (conditions) {
+ return $http.post("userWorkspace/departmentAdd", conditions).then(function (response) {
+ $log.debug("遺��꽌 �깮�꽦 寃곌낵 : ", response);
+ return response;
+ });
+ },
find : function (conditions) {
return $http.post("userWorkspace/find", conditions).then(function (response) {
$log.debug("�썙�겕�뒪�럹�씠�뒪�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 : ", response);
@@ -53,7 +53,13 @@
$log.debug("�궗�슜�옄 �벑湲� 沅뚰븳 蹂�寃� 寃곌낵 : ", response);
return response;
});
- }
+ },
+ modify : function (conditions) {
+ return $http.post("userWorkspace/modify", conditions).then(function (response) {
+ $log.debug("李몄뿬 �긽�깭 �닔�젙 寃곌낵 : ", response);
+ return response;
+ });
+ },
}
}
])
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index f47028f..15f5661 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -83,11 +83,11 @@
<div class="col-xl-4">
<div class="form-group form-buttons-w2">
- <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
+ <button class="btn btn-xlg btn-navy" ng-click="fn.getDepartmentList(0)">
<i class="os-icon os-icon-ui-37"></i>
<span translate="common.search">寃��깋</span>
</button>
- <button class="btn btn-xlg btn-white" ng-click="fn.initSearch()">
+ <button class="btn btn-xlg btn-white" ng-click="fn.initSearchDepartment()">
<i class="os-icon os-icon-grid-18"></i>
<span translate="common.reset">珥덇린�솕</span>
</button>
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index caa1e51..73ab5ad 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -59,7 +59,7 @@
</tr>
<tr>
<td class="text-left bold">
- <span translate="manageUser.manageUserPerm">�궗�슜�옄 愿�由�</span>
+ <span translate="manageUser.manageApiPerm">API 愿�由�</span>
</td>
<td>
<label class='switch'><input type='checkbox' ng-model='vm.form.permApi'><span class='slider round'></span></label>
diff --git a/src/main/webapp/views/workspace/workspaceLevelModify.html b/src/main/webapp/views/workspace/workspaceLevelModify.html
index 89492fd..5dbb0f4 100644
--- a/src/main/webapp/views/workspace/workspaceLevelModify.html
+++ b/src/main/webapp/views/workspace/workspaceLevelModify.html
@@ -1,7 +1,7 @@
<div class="formModal">
<div class="modal-header faded smaller">
<div class="modal-title">
- <strong>�벑湲� �닔�젙</strong>
+ <strong>�벑湲됰챸 �닔�젙</strong>
</div>
<button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
<span aria-hidden="true"> ×</span>
@@ -9,7 +9,7 @@
</div>
<div class="modal-body">
- <form role="form" name="levelAddForm">
+ <form role="form" name="levelModifyForm">
<table class="table table-lightborder">
<tr>
<td>
@@ -40,8 +40,8 @@
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(levelAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit(vm.form)"
- ng-disabled="fn.formCheck(paymentAddForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(levelModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit(vm.form)"
+ ng-disabled="fn.formCheck(levelModifyForm.$invalid)"
ng-click="fn.formSubmit(vm.form)"><span translate="common.save">���옣</span>
</button>
</div>
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index c611a83..7562820 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -97,9 +97,8 @@
<label>�벑湲�</label>
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="levels"
- selected-model="vm.search.levels"
- extra-settings="{ stringTypeOption : true }"
- options="vm.options.levels"></ng-dropdown-multiselect>
+ selected-model="vm.search.levels.levelName"
+ options="vm.levels"></ng-dropdown-multiselect>
</div>
</div>
@@ -107,10 +106,9 @@
<div class="form-group">
<label>遺��꽌</label>
<ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="depart"
+ data-input-name="departments"
selected-model="vm.search.departments"
- extra-settings="{ stringTypeOption : true }"
- options="vm.options.departments"></ng-dropdown-multiselect>
+ options="::vm.departments"></ng-dropdown-multiselect>
</div>
</div>
@@ -123,7 +121,7 @@
<div class="col-xl-11">
<div class="form-group form-buttons-w2">
- <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(0)">
+ <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
<i class="os-icon os-icon-ui-37"></i>
<span translate="common.search">寃��깋</span>
</button>
--
Gitblit v1.8.0