From 4120b8a1aeccc536da29b91b99e4032835a747e5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 25 10월 2021 17:17:59 +0900
Subject: [PATCH] 사용자관리 view 수정
---
src/main/webapp/scripts/app/manageUser/manageUser.controller.js | 15 ++
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 37 ++++-
src/main/webapp/scripts/app/workspace/workspace.js | 4
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 24 +++
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 148 +++++++++++++++++++++
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 35 ++++
src/main/webapp/views/workspace/workspaceLevelAdd.html | 89 ++++++++++++
src/main/webapp/views/workspace/workspaceUserConfig.html | 22 +++
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 1
src/main/webapp/views/workspace/workspace.html | 15 +
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 2
src/main/webapp/scripts/main.js | 1
src/main/webapp/views/notice/noticeList.html | 17 ++
13 files changed, 388 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 93a06cf..9f6810b 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -9,6 +9,7 @@
common.issue=\uC77C\uAC10
common.issueList=\uC77C\uAC10 \uBAA9\uB85D
common.status=\uC0C1\uD0DC
+common.level=\uB4F1\uAE09
common.issueKey=\uC77C\uAC10 \uBC88\uD638
common.issueTitle=\uC77C\uAC10 \uC81C\uBAA9
common.content=\uB0B4\uC6A9
diff --git a/src/main/webapp/scripts/app/manageUser/manageUser.controller.js b/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
index e4fdb9a..a36d03d 100644
--- a/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
+++ b/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
@@ -22,7 +22,8 @@
$scope.vm.search = {
name : "", // �씠由�
account : "", // �씠硫붿씪
- statuses : [] // �긽�깭 - Y, N
+ statuses : [], // �긽�깭 - Y, N
+ levels : [] // �벑湲�
};
$scope.vm.options = {
@@ -35,6 +36,17 @@
fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
}]
};
+
+ /*$scope.vm.options = {
+ levels : [{
+ fieldKey : "Y",
+ fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
+ }, {
+ fieldKey : "N",
+ //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
+ fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
+ }]
+ };*/
$scope.vm.page = {
selectedPage : 0,
@@ -68,6 +80,7 @@
$scope.vm.search.name = "";
$scope.vm.search.account = "";
$scope.vm.search.statuses = ["Y"];
+ $scope.vm.search.levels = [];
$scope.fn.getUserWorkspaceList(0);
}
diff --git a/src/main/webapp/scripts/app/workspace/workspace.js b/src/main/webapp/scripts/app/workspace/workspace.js
index 4a74c71..5181748 100644
--- a/src/main/webapp/scripts/app/workspace/workspace.js
+++ b/src/main/webapp/scripts/app/workspace/workspace.js
@@ -32,9 +32,9 @@
resolve : {
loadController : ["$q", function ($q) {
var deferred = $q.defer();
- require(["modalFormAutoScroll", "workspaceController", "workspacePaymentExecuteController", "workspaceUserConfigController", "workspacePaymentModifyController",
+ require(["modalFormAutoScroll", "workspaceController", "workspaceLevelAddController", "workspacePaymentExecuteController", "workspaceUserConfigController", "workspacePaymentModifyController",
"workspacePaymentAgreeTermController", "paymentService", "userWorkspaceService", "workspaceService", "numberOnly", 'jsTable', 'tableColumnGenerator',
- "crypto", "reservationDisableUserService", "workspacePaymentAddController"], function () {
+ "crypto", "reservationDisableUserService", "workspacePaymentAddController", "workspaceUserLevelController", "workspaceDepartmentConfigController"], function () {
deferred.resolve();
});
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 9245cbf..a03d0c9 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -8,7 +8,7 @@
'angular'
],
function (app, angular) {
- app.controller('workspaceUserConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
+ 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) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
new file mode 100644
index 0000000..afca607
--- /dev/null
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -0,0 +1,148 @@
+/**
+ * Created by wisestone on 2018-02-19.
+ */
+'use strict';
+
+define([
+ 'app',
+ 'angular'
+ ],
+ function (app, angular) {
+ app.controller('workspaceLevelAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'Workspace', '$filter', 'parameter', '$timeout',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, Payment, $filter, parameter, $timeout) {
+
+ $scope.fn = {
+ //add : add, // �벑湲� 異붽�
+ cancel : cancel, // �뙘�뾽 李� �떕湲�
+ formCheck : formCheck, // �뤌 泥댄겕
+ formSubmit : formSubmit
+ };
+
+ $scope.vm = {
+ form : {
+ /*workspaceId : parameter.workspaceId,
+ usdKrw : parameter.usdKrw,
+ maxUser : parameter.maxUser,
+ buyUser : "",
+ type : "MONTH",
+ cardNumber1 : "",
+ cardNumber2 : "",
+ cardNumber3 : "",
+ cardNumber4 : "",
+ expireMonth : "",
+ expireYear : "",
+ expireYearTmp : "",
+ birth : "",
+ cardPwd : "",
+ paymentAmountTemp : "", // �겢�씪�씠�뼵�듃�뿉�꽌 �궗�슜�옄 �닔瑜� 蹂�寃쏀븷 �븣 蹂댁뿬以� 寃곗젣 湲덉븸 - 湲덉븸�� �꽌踰꾩뿉�꽌 �떎�떆 怨꾩궛�븳�떎.
+ confirm : false // �빟愿� �룞�쓽*/
+ },
+ viewAgreeTerm : false
+ };
+
+ // �궗�슜�옄 媛�寃� 蹂닿린
+ /*$scope.$watch("vm.form.buyUser", function (newValue) {
+
+ if ($rootScope.isDefined(newValue)) {
+ var totalAmount = (BILLING_AMOUNT * $scope.vm.form.usdKrw * newValue);
+ var discount = 0;
+
+ if (newValue > 99) {
+ var sale = newValue * 0.01;
+ discount = (totalAmount * (sale/100));
+ }
+
+ $scope.vm.form.paymentAmountTemp = Math.floor(totalAmount - discount);
+ }
+ else {
+ $scope.vm.form.paymentAmountTemp = 0;
+ }
+ });*/
+
+ // �뤌 �쟾�넚
+ /*function formSubmit() {
+ $rootScope.spinner = true;
+
+ $scope.vm.form.expireYear = "20" + $scope.vm.form.expireYearTmp;
+ var content = angular.copy($scope.vm.form);
+
+ // �븫�샇�솕 �떆媛꾨룞�븞 �봽濡쒓렇�옒�뒪諛� 紐살삱由щ뒗 �쁽�긽 �닔�젙
+ $timeout(function () {
+ content.cardNumber1 = $rootScope.encryption($scope.vm.form.cardNumber1);
+ content.cardNumber2 = $rootScope.encryption($scope.vm.form.cardNumber2);
+ content.cardNumber3 = $rootScope.encryption($scope.vm.form.cardNumber3);
+ content.cardNumber4 = $rootScope.encryption($scope.vm.form.cardNumber4);
+ content.expireMonth = $rootScope.encryption($scope.vm.form.expireMonth);
+ content.expireYear = $rootScope.encryption($scope.vm.form.expireYear);
+ content.cardPwd = $rootScope.encryption($scope.vm.form.cardPwd);
+ content.birth = $rootScope.encryption($scope.vm.form.birth);
+
+ Payment.immediateAddUser($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ SweetAlert.success($filter("translate")("managementWorkspace.paymentCompleted"), result.data.message.message); // "異붽� 寃곗젣 �꽦怨�"
+ // 寃곗젣 諛� �뾽臾� 怨듦컙 �젙蹂� �솕硫� 媛깆떊
+ $rootScope.$broadcast("findMyWorkspace", {});
+ $rootScope.$broadcast("getPaymentDetail", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToRegularPaymentChange"), result.data.message.message); // "異붽� 寃곗젣 �떎�뙣"
+ }
+
+ $rootScope.spinner = false;
+ });
+ }, 100);
+ }*/
+
+ // �뙘�뾽 李� �떕湲�
+ function cancel() {
+ $rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
+ $uibModalInstance.dismiss('cancel');
+ $(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
+ }
+
+ // �궗�슜�옄 �닔 蹂�寃�
+ /*function changeBuyUser(changeType) {
+ if (changeType === "PLUS") {
+ if ($scope.vm.form.buyUser < 999) {
+ $scope.vm.form.buyUser++;
+ }
+ }
+ else {
+ if ($scope.vm.form.buyUser > 1) {
+ $scope.vm.form.buyUser--;
+ }
+ }
+ }*/
+
+ // �뤌 泥댄겕
+ /*function formCheck() {
+ if (!$scope.vm.form.confirm) {
+ return true;
+ }
+
+ if (!$rootScope.isDefined($scope.vm.form.cardNumber1) || !$rootScope.isDefined($scope.vm.form.cardNumber2) || !$rootScope.isDefined($scope.vm.form.cardNumber3)
+ || !$rootScope.isDefined($scope.vm.form.cardNumber4) || !$rootScope.isDefined($scope.vm.form.expireMonth) || !$rootScope.isDefined($scope.vm.form.expireYearTmp)
+ || !$rootScope.isDefined($scope.vm.form.birth) || !$rootScope.isDefined($scope.vm.form.cardPwd) || !$rootScope.isDefined($scope.vm.form.type)) {
+ return true;
+ }
+
+ if ($scope.vm.form.cardNumber1.length !== 4 || $scope.vm.form.cardNumber2.length !== 4 || $scope.vm.form.cardNumber3.length !== 4 || $scope.vm.form.cardNumber4.length !== 4
+ || $scope.vm.form.expireMonth.length !== 2 || $scope.vm.form.expireYearTmp.length !== 2 || $scope.vm.form.birth.length < 6 || $scope.vm.form.cardPwd.length !== 2) {
+ return true;
+ }
+
+ // �궗�슜�옄 �닔�뒗 1紐� �씠�긽�씠�뼱�빞 �븳�떎.
+ if ($scope.vm.form.buyUser < 1) {
+ return true;
+ }
+
+ return false;
+ }*/
+ }
+
+ ]);
+ }
+);
\ No newline at end of file
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 9245cbf..4afc064 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -24,7 +24,9 @@
$scope.vm.search = {
name : "", // �씠由�
account : "", // �씠硫붿씪
- statuses : [] // �긽�깭 - Y, N
+ statuses : [], // �긽�깭 - Y, N
+ level : [], // �벑湲�
+ departs : [] // 遺��꽌
};
$scope.vm.options = {
@@ -35,8 +37,38 @@
fieldKey : "N",
//fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�"
fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
+ }],
+ levels : [{
+ fieldKey : "S",
+ //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
+ fieldValue : "�뒋�띁 愿�由ъ옄"
+ }, {
+ fieldKey : "U",
+ //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
+ fieldValue : "�궗�슜�옄"
+ }],
+ departs : [{
+ fieldKey : "A",
+ //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
+ fieldValue : "媛쒕컻遺�"
+ }, {
+ fieldKey : "B",
+ //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
+ fieldValue : "寃쎌쁺吏��썝遺�"
}]
};
+
+ /*$scope.vm.options = {
+ levels : [{
+ fieldKey : "S",
+ //fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬"
+ fieldValue : "�뒋�띁 愿�由ъ옄"
+ }, {
+ fieldKey : "U",
+ //fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜"
+ fieldValue : "�궗�슜�옄"
+ }]
+ };*/
$scope.vm.page = {
selectedPage : 0,
@@ -79,6 +111,7 @@
$scope.vm.search.name = "";
$scope.vm.search.account = "";
$scope.vm.search.statuses = [];
+ $scope.vm.search.level = [];
$scope.fn.getUserWorkspaceList(0);
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 9245cbf..5e186a4 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -8,7 +8,7 @@
'angular'
],
function (app, angular) {
- app.controller('workspaceUserConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
+ app.controller('workspaceUserLevelController', ['$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) {
@@ -18,7 +18,7 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
-
+ $scope.fn.add = add; // �벑湲� 異붽�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -162,8 +162,26 @@
}
});
}
-
$scope.fn.makeTableConfigs();
+
+ // �벑湲� 異붽�
+ function add() {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceLevelAdd.html',
+ size : "md",
+ //controller : 'workspaceLevelAddController',
+ backdrop : 'static'
+ /*resolve : {
+ parameter : function () {
+ return {
+ workspaceId : $scope.vm.workspaceVo.id,
+ usdKrw : $scope.vm.workspaceVo.usdKrw,
+ maxUser : $scope.vm.workspaceVo.maxUser
+ };
+ }
+ }*/
+ });
+ }
}
]);
}
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index 0e5251d..34cb456 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -225,6 +225,7 @@
'workspacePaymentAddController' : 'app/workspace/workspacePaymentAdd.controller', // 異붽� 寃곗젣 而⑦듃濡ㅻ윭
'workspacePaymentAgreeTermController' : 'app/workspace/workspacePaymentAgreeTerm.controller', // �뾽臾� 怨듦컙 �씠�슜 �빟愿� �솗�씤 而⑦듃濡ㅻ윭
'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller', // �궗�슜�옄 愿�由� 而⑦듃濡ㅻ윭
+ 'workspaceLevelAddController' : 'app/workspace/workspaceLevelAdd.controller', // �궗�슜�옄 �벑湲� 異붽� 而⑦듃濡ㅻ윭
'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller', // �궗�슜�옄 遺��꽌 愿�由� 而⑦듃濡ㅻ윭
'workspaceService' : 'components/workspace/workspace.service', // �뾽臾� 怨듦컙�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
'paymentService' : 'components/payment/payment.service', // 寃곗옱�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
diff --git a/src/main/webapp/views/notice/noticeList.html b/src/main/webapp/views/notice/noticeList.html
index b46a997..7a6526f 100644
--- a/src/main/webapp/views/notice/noticeList.html
+++ b/src/main/webapp/views/notice/noticeList.html
@@ -8,7 +8,7 @@
<span translate="notice.registerNotice">怨듭��궗�빆 �벑濡�</span>
</button>
- <form class="form-inline justify-content-sm-end pull-right"
+ <!--<form class="form-inline justify-content-sm-end pull-right"
method="post"
action="/user/downloadExcel"
name="userListForm">
@@ -18,7 +18,7 @@
make-search-conditions="fn.makeSearchConditions()">
<span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span>
</button>
- </form>
+ </form>-->
</div>
<h6 class="element-header" translate="notice.notice">
@@ -84,7 +84,18 @@
</div>
</div>
<div class="col-sm-6 text-right">
-
+ <form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/project/downloadExcel" name="projectListForm">
+ <input type="hidden" name="conditions" autocomplete="off">
+ <div class="btn-group">
+ <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
+ </button>
+ <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+
+ </div>
+ </div>
+ </form>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/workspace/workspace.html b/src/main/webapp/views/workspace/workspace.html
index 9787eea..30e9be2 100644
--- a/src/main/webapp/views/workspace/workspace.html
+++ b/src/main/webapp/views/workspace/workspace.html
@@ -1,6 +1,15 @@
-<h6 class="element-header" translate="managementWorkspace.myWorkspace">
- �굹�쓽 �뾽臾닿났媛� 愿�由�
-</h6>
+<div class="element-wrapper">
+ <div class="element-actions">
+ <button ng-click="fn.add()" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')"
+ class="btn btn-xlg btn-danger"><i class="os-icon os-icon-plus"></i> <span
+ translate="managementWorkspace.addLevel">�벑湲� 異붽�</span>
+ </button>
+ </div>
+ <h6 class="element-header" translate="managementWorkspace.myWorkspace">
+ �굹�쓽 �뾽臾닿났媛� 愿�由�
+ </h6>
+</div>
+
<div class="os-tabs-w">
<div class="os-tabs-controls">
<ul class="nav nav-tabs upper">
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
new file mode 100644
index 0000000..011589d
--- /dev/null
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -0,0 +1,89 @@
+<div class="formModal" ng-controller="workspaceLevelAddController">
+ <div class="modal-header faded smaller">
+ <div class="modal-title">
+ <strong>�깉 �벑湲� 異붽�</strong>
+ </div>
+ <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
+ <span aria-hidden="true"> ×</span>
+ </button>
+ </div>
+
+ <div class="modal-body">
+ <form role="form" name="levelAddForm">
+ <table class="table table-lightborder">
+ <tr>
+ <td>
+ <label for="levelAddForm1"><span translate="managementWorkspace.levelName">�벑湲됰챸</span><code class="highlighter-rouge">*</code></label>
+ </td>
+ <td>
+ <div class="input-group mb-2 mr-sm-2 mb-sm-0">
+ <input id="levelAddForm1"
+ class="form-control" placeholder="異붽� �븷 �벑湲됰챸�쓣 �엯�젰�븯�꽭�슂."
+ type="text"
+ ng-model="vm.form.name"
+ maxlength="50"
+ autofocus
+ required>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageProjectPerm">�봽濡쒖젥�듃 愿�由�</span>
+ </td>
+ </tr>
+ <!--<tr>
+ <td>
+ <span translate="managementWorkspace.read">�씫湲�</span>
+ <span translate="managementWorkspace.write">�벐湲�</span>
+ </td>
+ </tr>-->
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageIssueSystemPerm">�씠�뒋 �떆�뒪�뀥</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageUserPerm">�궗�슜�옄</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageNoticePerm">怨듭��궗�빆</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageFAQPerm">FAQ</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageQnAPerm">QnA</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageEventPerm">�씠踰ㅽ듃</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageGuidePerm">媛��씠�뱶</span>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+
+ <div class="modal-footer buttons-on-right">
+ <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(paymentAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(paymentAddForm.$invalid)"
+ ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
+ </button>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 10de62f..b97292e 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -94,6 +94,28 @@
<div class="col-xl-3">
<div class="form-group">
+ <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>
+ </div>
+ </div>
+
+ <div class="col-xl-3">
+ <div class="form-group">
+ <label>遺��꽌紐�</label>
+ <ng-dropdown-multiselect class="multiSelect cursor"
+ data-input-name="depart"
+ selected-model="vm.search.departs"
+ extra-settings="{ stringTypeOption : true }"
+ options="vm.options.departs"></ng-dropdown-multiselect>
+ </div>
+ </div>
+
+ <div class="col-xl-3">
+ <div class="form-group">
<label translate="common.email">�씠硫붿씪</label>
<input class="form-control" type="text" ng-model="vm.search.account" maxlength="50">
</div>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 5d2e541..8ea347e 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -1,13 +1,10 @@
<div class="row" ng-controller="workspaceUserLevelController">
-</div>
-
-<div class="row">
<div class="col-lg-12">
<div class="element-box">
<div class="searchdiv">
<form name="userWorkspaceForm" role="form" ng-enter="fn.getUserWorkspaceList(0)">
<div class="row">
- <div class="col-xl-2">
+ <!--<div class="col-xl-2">
<div class="form-group">
<label translate="common.name">�씠由�</label>
<input class="form-control" type="text" ng-model="vm.search.name" maxlength="10">
@@ -29,6 +26,13 @@
<div class="form-group">
<label translate="common.email">�씠硫붿씪</label>
<input class="form-control" type="text" ng-model="vm.search.account" maxlength="50">
+ </div>
+ </div>-->
+
+ <div class="col-xl-3">
+ <div class="form-group">
+ <label translate="managementWorkspace.levelName">�벑湲됰챸</label>
+ <input class="form-control" type="text" ng-model="vm.search.level" maxlength="50">
</div>
</div>
@@ -65,8 +69,8 @@
</label>
</div>
</div>
- <!--<div class="col-sm-6 text-right">
- <div class="btn-group">
+ <div class="col-sm-6 text-right">
+ <!--<div class="btn-group">
<button aria-expanded="false"
aria-haspopup="true"
class="btn btn-secondary dropdown-toggle"
@@ -77,13 +81,30 @@
class="dropdown-menu"
x-placement="bottom-start"
style="position: absolute; transform: translate3d(0px, 30px, 0px); top: 0px; left: 0px; will-change: transform;">
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item" href="#"> �궘�젣</a>
</div>
- </div>
- </div>-->
+ </div>-->
+ <form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/workspace/downloadExcel" name="userLevelListForm">
+ <input type="hidden" name="conditions" autocomplete="off">
+ <div class="btn-group">
+ <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
+ </button>
+ <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ </div>
+ </div>
+ </form>
+ </div>
</div>
</div>
+ <!--<div class="table-responsive">
+ <js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
+ event="vm.tableEvent"></js-table>
+ </div>-->
+
<div class="table-responsive">
<js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
event="vm.tableEvent"></js-table>
--
Gitblit v1.8.0