From 29b3e2f7ca000ca83ace5a2f71bb7ca753145df9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 10:41:59 +0900
Subject: [PATCH] 부서,등급 파일명 변경
---
src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js | 81 +++++++++++++++-------------------------
1 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
index 2a4e97f..38c5c33 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
@@ -8,37 +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, // 異붽��븳 遺��꽌 �젣嫄�
};
$scope.vm = {
id : parameter.id,
form : {
- id : parameter.id,
- departmentList : [], // �쁽�옱 遺��꽌 紐⑸줉
- departments : [] // 遺��꽌
- },
- departmentName : "", //遺��꽌紐� 寃��깋
- /*autoCompletePage : {
- project : {
- page : 0,
- totalPage : 0
- }
- },*/
+ departmentName : "",
+ departmentDescription : ""
+ }
};
- angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- // �꽑�깮 �븳 遺��꽌 �젣嫄�
- function removeDepartments(index) {
- $scope.vm.form.departments.splice(index, 1);
+ // �긽�꽭 �젙蹂�
+ 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) {
@@ -54,25 +61,19 @@
$rootScope.spinner = true;
var content = {
- id : $scope.vm.form.id,
- departmentName : (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)
};
- //user_department INSERT �슂泥�
- 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);
@@ -88,26 +89,6 @@
$rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
$uibModalInstance.dismiss('cancel');
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
- }
-
- function detail() {
- var contents = {
- id : parameter.id
- }
-
- UserWorkspace.userDepartmentDetail($resourceProvider.getContent(
- contents,
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
-
- if (result.data.message.status === "success") {
- if (angular.isDefined(result.data.data)) {
- $scope.vm.form.departmentList = result.data.data; //泥댄겕 �븘�슂
- }
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToDepartmentsOfUserDetails"), result.data.message.message); //"�궗�슜�옄�쓽 遺��꽌 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
}
$scope.fn.detail();
--
Gitblit v1.8.0