From f50a2f797e9e43833b9b8b7ba297a2da6dac1321 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 08 11월 2021 18:04:08 +0900
Subject: [PATCH] 사용자 관리 프론트 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 84 +++++++++++++-----------------------------
src/main/webapp/views/companyField/companyFieldModify.html | 35 +++++++----------
2 files changed, 41 insertions(+), 78 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index 9da25a4..59353a3 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -55,45 +55,7 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
modifyUserWorkspace : modifyUserWorkspace, // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- modifyLevel : modifyLevel, // �궗�슜�옄 �벑湲됰챸 蹂�寃�
- departmentModify : departmentModify // 遺��꽌 蹂�寃�
};
-
- // �궗�슜�옄 �벑湲� �닔�젙
- 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.]
- };
- }
- }
- });
- }
-
- // 遺��꽌 �닔�젙
- function departmentModify(id) {
- $uibModal.open({
- templateUrl : 'views/workspace/workspaceDepartmentModify.html',
- size : "md",
- controller : 'departmentModifyController',
- backdrop : 'static',
- resolve : {
- parameter : function () {
- return {
- id : id,
- //levelName : [$scope.vm.form.]
- };
- }
- }
- });
- }
// �긽�꽭 �젙蹂�
$scope.$on("getUserWorkspaceList", function () {
@@ -102,22 +64,6 @@
$scope.fn.makeTableConfigs();
$scope.fn.getUserWorkspaceList(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() {
@@ -235,12 +181,18 @@
data.departments = [];
data.levels = $scope.vm.levels.slice();
data.departments = $scope.vm.departments.slice();
+ /*if(result.data.data[idx].departmentId == null){
+ data.departments = $scope.vm.departments.slice();
+ data.departments.unshift({
+ fieldKey : 'd',
+ fieldValue : '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.'
+ });
+ result.data.data[idx].departmentId = 'd';
+ } else{
+ data.departments = $scope.vm.departments.slice();
+ }*/
idx++;
});
- /*if(result.data.data[idx-1].departmentId == 0){
- //console.log($scope.vm.tableConfigs);
- //result.data.data[idx-1].department.fieldValue = '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.';
- }*/
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -299,6 +251,22 @@
return deferred.promise;
}
+
+ // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ 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); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
+ }
+ });
+ }
}
]);
}
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 7371acd..b9a7793 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -24,8 +24,8 @@
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
ng-model="vm.form.name"
- ng-maxlength="200"
- maxlength="200"
+ ng-maxlength="100"
+ maxlength="100"
required>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
@@ -103,8 +103,8 @@
>
<!–<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>–>
</div>-->
- <div class="col-md-7">
- <div class="modal-body">
+ <div>
+ <div class="form-group">
<label for="companyFieldAddForm9" class="issue-label">
<span translate="companyField.manager">�떞�떦�옄</span>
</label>
@@ -116,13 +116,13 @@
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
ng-model="vm.form.manager"
- ng-maxlength="200"
- maxlength="200"
+ ng-maxlength="100"
+ maxlength="100"
>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
</div>
- <div class="col-md-7">
+ <div>
<div class="form-group">
<label for="companyFieldAddForm7" class="issue-label">
<span translate="companyField.tel">�쟾�솕踰덊샇</span>
@@ -131,37 +131,34 @@
name="tel"
type="text"
class="form-control"
- autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tel"
- ng-maxlength="200"
- maxlength="200"
+ maxlength="20"
>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
</div>
- <div class="col-md-7">
+ <div>
<div class="form-group">
<label for="companyFieldAddForm6" class="issue-label">
<span translate="companyField.email">�씠硫붿씪</span>
</label>
<input id="companyFieldAddForm6"
name="email"
- type="text"
+ type="email"
class="form-control"
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
+ maxLength="50"
ng-model="vm.form.email"
- ng-maxlength="200"
- maxlength="200"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
</div>
- <div class="col-md-7">
+ <div>
<div class="form-group">
<label for="companyFieldAddForm8" class="issue-label">
<span translate="companyField.desc">鍮꾧퀬</span>
@@ -170,9 +167,7 @@
name="memo"
type="text"
class="form-control"
- autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
ng-model="vm.form.memo"
ng-maxlength="200"
--
Gitblit v1.8.0