From 29b3e2f7ca000ca83ace5a2f71bb7ca753145df9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 10:41:59 +0900
Subject: [PATCH] 부서,등급 파일명 변경
---
/dev/null | 56 --------
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 4
src/main/webapp/views/workspace/workspaceDepartmentModify.html | 55 ++++---
src/main/webapp/views/workspace/workspaceUserDepartmentModify.html | 43 ++++++
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js | 4
src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js | 84 ++++-------
src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js | 123 +++++++++++++++++
src/main/webapp/scripts/app/workspace/workspace.js | 2
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 4
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 2
src/main/webapp/scripts/main.js | 10
11 files changed, 242 insertions(+), 145 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/departmentModify.controller.js b/src/main/webapp/scripts/app/workspace/departmentModify.controller.js
deleted file mode 100644
index d025eda..0000000
--- a/src/main/webapp/scripts/app/workspace/departmentModify.controller.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Created by wisestone on 2018-05-08.
- */
-'use strict';
-
-define([
- 'app',
- 'angular'
- ],
- function (app, angular) {
- app.controller('departmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {
-
- $scope.fn = {
- detail : detail, // �긽�꽭 議고쉶
- cancel : cancel, // �뙘�뾽 李� �떕湲�
- formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
- };
-
- $scope.vm = {
- id : parameter.id,
- form : {
- departmentName : "",
- departmentDescription : ""
- }
- };
-
- // �긽�꽭 �젙蹂�
- function detail() {
- var conditions = {
- id : parameter.id
- }
-
- UserWorkspace.departmentDetail($resourceProvider.getContent(
- conditions,
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
-
- if (result.data.message.status === "success") {
- if (angular.isDefined(result.data.data)) {
- $scope.vm.form.departmentName = result.data.data.departmentName;
- $scope.vm.form.departmentDescription = result.data.data.departmentDescription;
- }
- }
- else {
- SweetAlert.swal($filter("translate")("customField.failedToDetailUserDefinedFields"), result.data.message.message, "error"); // "�궗�슜�옄 �젙�쓽 �븘�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
- }
-
- function formCheck(formInvalid) {
- if (formInvalid) {
- return true;
- }
-
- return false;
- }
-
- // �뤌 �쟾�넚
- function formSubmit() {
- $rootScope.spinner = true;
-
- var content = {
- id : parameter.id,
- departmentName : $rootScope.preventXss($scope.vm.form.departmentName),
- departmentDescription : $rootScope.preventXss($scope.vm.form.departmentDescription)
- };
-
- UserWorkspace.departmentModify($resourceProvider.getContent(
- content,
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
-
- if (result.data.message.status === "success") {
- $scope.fn.cancel();
- // 紐⑸줉 �솕硫� 媛깆떊
- $rootScope.$broadcast("getDepartmentList", {});
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
- }
-
- $rootScope.spinner = false;
- });
-
- }
-
- // �뙘�뾽 李� �떕湲�
- function cancel() {
- $rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
- $uibModalInstance.dismiss('cancel');
- $(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
- }
-
- $scope.fn.detail();
-
- }]);
- });
diff --git a/src/main/webapp/scripts/app/workspace/workspace.js b/src/main/webapp/scripts/app/workspace/workspace.js
index 34606d0..bbad5f9 100644
--- a/src/main/webapp/scripts/app/workspace/workspace.js
+++ b/src/main/webapp/scripts/app/workspace/workspace.js
@@ -34,7 +34,7 @@
var deferred = $q.defer();
require(["modalFormAutoScroll", "workspaceController", "workspaceLevelAddController", "workspaceDepartmentAddController", "workspacePaymentExecuteController", "workspaceUserConfigController", "workspacePaymentModifyController",
"workspacePaymentAgreeTermController", "paymentService", "userWorkspaceService", "workspaceService", "numberOnly", 'jsTable', 'tableColumnGenerator', 'summerNote', 'summerNote-ko-KR', 'formSubmit',
- "crypto", "reservationDisableUserService", "workspacePaymentAddController", "workspaceUserLevelController", "workspaceDepartmentConfigController", "levelModifyController","departmentModifyController","workspaceDepartmentModifyController"], function () {
+ "crypto", "reservationDisableUserService", "workspacePaymentAddController", "workspaceUserLevelController", "workspaceDepartmentConfigController", "workspaceLevelModifyController","workspaceDepartmentModifyController","workspaceUserDepartmentModifyController"], 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 fcff089..0b405d2 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -139,9 +139,9 @@
// 遺��꽌 �닔�젙
function departmentModify(id) {
$uibModal.open({
- templateUrl : 'views/workspace/departmentModify.html',
+ templateUrl : 'views/workspace/workspaceDepartmentModify.html',
size : "md",
- controller : 'departmentModifyController',
+ controller : 'workspaceDepartmentModifyController',
backdrop : 'static',
resolve : {
parameter : function () {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
index 1c8f2a8..38c5c33 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
@@ -8,43 +8,44 @@
'angular'
],
function (app, angular) {
- app.controller('workspaceDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter', '$injector', '$controller',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter, $injector, $controller) {
+ app.controller('workspaceDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {
$scope.fn = {
+ detail : detail, // �긽�꽭 議고쉶
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- detail : detail, // �긽�꽭 �젙蹂� 議고쉶
- removeDepartments : removeDepartments, // 異붽��븳 遺��꽌 �젣嫄�
- getDepartmentListCallBack : getDepartmentListCallBack
};
$scope.vm = {
id : parameter.id,
- userId : parameter.userId,
form : {
- departments : [] // 遺��꽌
- },
- departmentName : "", //遺��꽌紐� 寃��깋
- /*autoCompletePage : {
- project : {
- page : 0,
- totalPage : 0
- }
- },*/
+ departmentName : "",
+ departmentDescription : ""
+ }
};
- angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- function getDepartmentListCallBack(result) {
- console.log("TEST");
+ // �긽�꽭 �젙蹂�
+ function detail() {
+ var conditions = {
+ id : parameter.id
+ }
- }
+ UserWorkspace.departmentDetail($resourceProvider.getContent(
+ conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
-
- // �꽑�깮 �븳 遺��꽌 �젣嫄�
- function removeDepartments(index) {
- $scope.vm.form.departments.splice(index, 1);
+ if (result.data.message.status === "success") {
+ if (angular.isDefined(result.data.data)) {
+ $scope.vm.form.departmentName = result.data.data.departmentName;
+ $scope.vm.form.departmentDescription = result.data.data.departmentDescription;
+ }
+ }
+ else {
+ SweetAlert.swal($filter("translate")("customField.failedToDetailUserDefinedFields"), result.data.message.message, "error"); // "�궗�슜�옄 �젙�쓽 �븘�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+ }
+ });
}
function formCheck(formInvalid) {
@@ -60,25 +61,19 @@
$rootScope.spinner = true;
var content = {
- id : $scope.vm.id,
- userId : $scope.vm.userId,
- ids : (function () {
- var departmentIds = [];
- angular.forEach($scope.vm.form.departments, function (department) {
- departmentIds.push(department.id);
- });
- return departmentIds;
- })()
+ id : parameter.id,
+ departmentName : $rootScope.preventXss($scope.vm.form.departmentName),
+ departmentDescription : $rootScope.preventXss($scope.vm.form.departmentDescription)
};
- UserWorkspace.userDepartmentModify($resourceProvider.getContent(
+ UserWorkspace.departmentModify($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
$scope.fn.cancel();
// 紐⑸줉 �솕硫� 媛깆떊
- $rootScope.$broadcast("getUserWorkspaceList", {});
+ $rootScope.$broadcast("getDepartmentList", {});
}
else {
SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
@@ -94,27 +89,6 @@
$rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
$uibModalInstance.dismiss('cancel');
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
- }
-
- function detail() {
- var contents = {
- id : parameter.id,
- userId : parameter.userId
- }
-
- UserWorkspace.userDepartmentDetail($resourceProvider.getContent(//test
- contents,
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
-
- if (result.data.message.status === "success") {
- if (angular.isDefined(result.data.data)) {
- $scope.vm.form.departments = result.data.data;
- }
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToDepartmentsOfUserDetails"), result.data.message.message); //"�궗�슜�옄�쓽 遺��꽌 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
}
$scope.fn.detail();
diff --git a/src/main/webapp/scripts/app/workspace/levelModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
similarity index 93%
rename from src/main/webapp/scripts/app/workspace/levelModify.controller.js
rename to src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
index edd2710..fdc77d8 100644
--- a/src/main/webapp/scripts/app/workspace/levelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -8,7 +8,7 @@
'angular'
],
function (app, angular) {
- app.controller('levelModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
+ app.controller('workspaceLevelModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {
$scope.fn = {
@@ -72,7 +72,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/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index f668b2d..e80257d 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -273,9 +273,9 @@
// �궗�슜�옄媛� �냽�빐�엳�뒗 遺��꽌 �닔�젙 �뙘�뾽
function modifyUserDepartments(id, userId) {
$uibModal.open({
- templateUrl : 'views/workspace/workspaceDepartmentModify.html',
+ templateUrl : 'views/workspace/workspaceUserDepartmentModify.html',
size : "xlg",
- controller : 'workspaceDepartmentModifyController',
+ controller : 'workspaceUserDepartmentModifyController',
backdrop : 'static',
windowClass : 'workflow-window',
resolve : {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js
new file mode 100644
index 0000000..2d5d733
--- /dev/null
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js
@@ -0,0 +1,123 @@
+/**
+ * Created by wisestone on 2018-05-08.
+ */
+'use strict';
+
+define([
+ 'app',
+ 'angular'
+ ],
+ function (app, angular) {
+ app.controller('workspaceUserDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter', '$injector', '$controller',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter, $injector, $controller) {
+
+ $scope.fn = {
+ cancel : cancel, // �뙘�뾽 李� �떕湲�
+ formSubmit : formSubmit, // �뤌 �쟾�넚
+ formCheck : formCheck, // �뤌 泥댄겕
+ detail : detail, // �긽�꽭 �젙蹂� 議고쉶
+ removeDepartments : removeDepartments, // 異붽��븳 遺��꽌 �젣嫄�
+ getDepartmentListCallBack : getDepartmentListCallBack
+ };
+
+ $scope.vm = {
+ id : parameter.id,
+ userId : parameter.userId,
+ form : {
+ departments : [] // 遺��꽌
+ },
+ departmentName : "", //遺��꽌紐� 寃��깋
+ /*autoCompletePage : {
+ project : {
+ page : 0,
+ totalPage : 0
+ }
+ },*/
+ };
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+ function getDepartmentListCallBack(result) {
+ console.log("TEST");
+
+ }
+
+
+ // �꽑�깮 �븳 遺��꽌 �젣嫄�
+ function removeDepartments(index) {
+ $scope.vm.form.departments.splice(index, 1);
+ }
+
+ function formCheck(formInvalid) {
+ if (formInvalid) {
+ return true;
+ }
+
+ return false;
+ }
+
+ // �뤌 �쟾�넚
+ function formSubmit() {
+ $rootScope.spinner = true;
+
+ var content = {
+ id : $scope.vm.id,
+ userId : $scope.vm.userId,
+ ids : (function () {
+ var departmentIds = [];
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+ return departmentIds;
+ })()
+ };
+
+ UserWorkspace.userDepartmentModify($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ // 紐⑸줉 �솕硫� 媛깆떊
+ $rootScope.$broadcast("getUserWorkspaceList", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
+ }
+
+ $rootScope.spinner = false;
+ });
+
+ }
+
+ // �뙘�뾽 李� �떕湲�
+ function cancel() {
+ $rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
+ $uibModalInstance.dismiss('cancel');
+ $(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
+ }
+
+ function detail() {
+ var contents = {
+ id : parameter.id,
+ userId : parameter.userId
+ }
+
+ UserWorkspace.userDepartmentDetail($resourceProvider.getContent(//test
+ contents,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (angular.isDefined(result.data.data)) {
+ $scope.vm.form.departments = result.data.data;
+ }
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToDepartmentsOfUserDetails"), result.data.message.message); //"�궗�슜�옄�쓽 遺��꽌 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+ }
+ });
+ }
+
+ $scope.fn.detail();
+
+ }]);
+ });
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 154ae90..694b485 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -75,7 +75,7 @@
$uibModal.open({
templateUrl : 'views/workspace/workspaceLevelModify.html',
size : "md",
- controller : 'levelModifyController',
+ controller : 'workspaceLevelModifyController',
backdrop : 'static',
resolve : {
parameter : function () {
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index 9c4f188..1c90030 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -224,15 +224,15 @@
'workspacePaymentModifyController' : 'app/workspace/workspacePaymentModify.controller', // 寃곗옱 �닔�젙 而⑦듃濡ㅻ윭
'workspacePaymentAddController' : 'app/workspace/workspacePaymentAdd.controller', // 異붽� 寃곗젣 而⑦듃濡ㅻ윭
'workspacePaymentAgreeTermController' : 'app/workspace/workspacePaymentAgreeTerm.controller', // �뾽臾� 怨듦컙 �씠�슜 �빟愿� �솗�씤 而⑦듃濡ㅻ윭
- 'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller', // �궗�슜�옄 愿�由� 而⑦듃濡ㅻ윭
+ 'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller', // �궗�슜�옄 �벑湲� 愿�由� 而⑦듃濡ㅻ윭
'workspaceLevelAddController' : 'app/workspace/workspaceLevelAdd.controller', // �궗�슜�옄 �벑湲� 異붽� 而⑦듃濡ㅻ윭
- 'levelModifyController' : 'app/workspace/levelModify.controller', // �궗�슜�옄 �벑湲� �닔�젙 而⑦듃濡ㅻ윭
- 'departmentModifyController' : 'app/workspace/departmentModify.controller', // 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
+ 'workspaceLevelModifyController' : 'app/workspace/workspaceLevelModify.controller', // �궗�슜�옄 �벑湲� �닔�젙 而⑦듃濡ㅻ윭
+ 'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller', // 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
'workspaceDepartmentAddController' : 'app/workspace/workspaceDepartmentAdd.controller', // 遺��꽌 異붽� 而⑦듃濡ㅻ윭
- 'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller', // �궗�슜�옄 遺��꽌 愿�由� 而⑦듃濡ㅻ윭
+ 'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller', // 遺��꽌 愿�由� 而⑦듃濡ㅻ윭
+ 'workspaceUserDepartmentModifyController' : 'app/workspace/workspaceUserDepartmentModify.controller', // �궗�슜�옄 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
'workspaceService' : 'components/workspace/workspace.service', // �뾽臾� 怨듦컙�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
'paymentService' : 'components/payment/payment.service', // 寃곗옱�뿉 愿��젴�맂 �넻�떊�쓣 �떞�떦�븳�떎.
- 'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller', // �궗�슜�옄 遺��꽌 �닔�젙 而⑦듃濡ㅻ윭
/* �궗�슜�옄 */
'userRoute' : 'app/user/user', // �궗�슜�옄�뿉 愿��젴�맂 route �젙蹂�
diff --git a/src/main/webapp/views/workspace/departmentModify.html b/src/main/webapp/views/workspace/departmentModify.html
deleted file mode 100644
index 8b28d33..0000000
--- a/src/main/webapp/views/workspace/departmentModify.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="formModal">
- <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="departmentModifyForm">
- <div class="form-group">
- <label for="departmentModifyForm1">
- <span translate="common.departmentName">遺��꽌紐�</span>
- <code class="highlighter-rouge">*</code>
- </label>
- <input id="departmentModifyForm1"
- name="name"
- 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.departmentName"
- ng-maxlength="200"
- maxlength="200"
- required>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
-
- <div class="form-group">
- <label>
- <span translate="manageDepartment.departmentEx">遺��꽌 �꽕紐�</span>
- </label>
- <summernote
- class="summernote"
- lang="ko-KR"
- config="vm.options"
- ng-model="vm.form.departmentDescription"
- target=".note-editable"></summernote>
- </div>
- </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(departmentModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(departmentModifyForm.$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/workspaceDepartmentModify.html b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
index ca26f41..8b28d33 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
@@ -1,7 +1,7 @@
-<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
+<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,24 +9,37 @@
</div>
<div class="modal-body">
- <form role="form" name="departmentsModifyForm">
+ <form role="form" name="departmentModifyForm">
<div class="form-group">
- <label><span translate="common.departmentName">遺��꽌紐�</span> </label>
- <js-autocomplete-multi data-input-name="departments"
- selected-model="vm.form.departments"
- search="vm.departmentName"
- source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
- input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+ <label for="departmentModifyForm1">
+ <span translate="common.departmentName">遺��꽌紐�</span>
+ <code class="highlighter-rouge">*</code>
+ </label>
+ <input id="departmentModifyForm1"
+ name="name"
+ 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.departmentName"
+ ng-maxlength="200"
+ maxlength="200"
+ required>
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ </div>
-
- <div class="select3-selection__choicediv mt-10">
- <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
- <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
- <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">횞</span>
- </span>
- </div>
+ <div class="form-group">
+ <label>
+ <span translate="manageDepartment.departmentEx">遺��꽌 �꽕紐�</span>
+ </label>
+ <summernote
+ class="summernote"
+ lang="ko-KR"
+ config="vm.options"
+ ng-model="vm.form.departmentDescription"
+ target=".note-editable"></summernote>
</div>
</form>
</div>
@@ -35,9 +48,9 @@
<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(departmentsModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(departmentsModifyForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(departmentModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(departmentModifyForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
new file mode 100644
index 0000000..ca26f41
--- /dev/null
+++ b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
@@ -0,0 +1,43 @@
+<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
+ <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="departmentsModifyForm">
+ <div class="form-group">
+ <label><span translate="common.departmentName">遺��꽌紐�</span> </label>
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.form.departments"
+ search="vm.departmentName"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
+ input-disabled="false"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
+
+ <div class="select3-selection__choicediv mt-10">
+ <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
+ <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">횞</span>
+ </span>
+ </div>
+ </div>
+ </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(departmentsModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(departmentsModifyForm.$invalid)"
+ ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
+ </button>
+ </div>
+</div>
--
Gitblit v1.8.0