From 0b42a6126bb73a9f7c3b5e154c9021de43f9d8c5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 11 11월 2021 17:13:29 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트
---
src/main/webapp/views/workspace/workspaceDepartmentModify.html | 4 ++--
src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js | 2 +-
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 15 +++++++++------
3 files changed, 12 insertions(+), 9 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 49b8c58..a5a0c30 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -135,12 +135,15 @@
case "USE_DEPARTMENT_LIST" :
makeTag += "<ul class='ul-not-comma'>";
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>";
- angular.forEach(scope.data.departments, function (department) { //departmentVO濡� �닔�젙 泥댄겕 �븘�슂
- makeTag += "<li>" + department.fieldValue + "</li>";
- });
- makeTag += "</div>";
-
+ if(scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>遺��꽌瑜� �꽑�깮 �빐二쇱꽭�슂.</div>";
+ }else{
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ }
makeTag += "</ul>";
break;
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
index 6129ec0..e274656 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
@@ -26,7 +26,7 @@
departmentList : [], // �쁽�옱 遺��꽌 紐⑸줉
departments : [] // 遺��꽌
},
- departmentName : "", //遺��꽌紐� 寃��깋
+ departmentName : [], //遺��꽌紐� 寃��깋
/*autoCompletePage : {
project : {
page : 0,
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentModify.html b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
index 697f309..fb7c7a6 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
@@ -15,10 +15,10 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getUserDepartmentList(vm.departmentName, vm.form.users)"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.form.departmentList)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, imagePathProp : 'profile', type : 'user', maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
--
Gitblit v1.8.0