From 9b589820e73c0ca36ceca13ddd6b8c2dda810459 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 17:03:41 +0900
Subject: [PATCH] 이슈 메일 보내기 기능 - 전체 대상자 출력 백엔드
---
src/main/webapp/scripts/app/project/projectModify.controller.js | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index d0f6edf..42388f1 100644
--- a/src/main/webapp/scripts/app/project/projectModify.controller.js
+++ b/src/main/webapp/scripts/app/project/projectModify.controller.js
@@ -18,6 +18,7 @@
detail : detail, // �긽�꽭 �젙蹂� 議고쉶
removeUsr : removeUsr, // �씪諛� �궗�슜�옄 �젣嫄�
removeManager : removeManager, // 愿�由ъ옄 �젣嫄�
+ removeDepartment : removeDepartment, // 遺��꽌 �젣嫄�
getManagerListCallBack : getManagerListCallBack, // 愿�由ъ옄 auto complete callback function
getProjectListCallBack : getProjectListCallBack // �봽濡쒖젥�듃 auto complete callback function
};
@@ -74,6 +75,11 @@
$scope.vm.form.users.splice(index, 1);
}
+ // �떞�떦遺��꽌 �궘�젣
+ function removeDepartment(index) {
+ $scope.vm.form.departments.splice(index, 1);
+ }
+
// 愿�由ъ옄 �궘�젣
function removeManager(index) {
$scope.vm.form.managers.splice(index, 1);
@@ -94,15 +100,9 @@
return true;
}
- if ($scope.vm.form.startEndDateRange == "") {
- return true;
- }
-
if ($scope.vm.form.managers.length < 1) {
return true;
}
-
-
return false;
}
@@ -131,8 +131,16 @@
userIds.push(user.id);
});
return userIds;
- })()
+ })(),
+ departmentIds : (function () {
+ var departmentIds = [];
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+ return departmentIds;
+ })(),
};
+
var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
content.startDate = startEndDateRange[0].trim();
@@ -170,10 +178,15 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.name = result.data.data.name;
$scope.vm.form.status = result.data.data.status;
- $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
+ if (result.data.data.startDate == "" && result.data.data.endDate == "") {
+ $scope.vm.form.startEndDateRange = ""
+ } else {
+ $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
+ }
$scope.vm.form.description = result.data.data.description;
$scope.vm.form.managers = result.data.data.projectManagerVos;
$scope.vm.form.users = result.data.data.projectUserVos;
+ $scope.vm.form.departments = result.data.data.projectDepartmentVos;
if (result.data.data.parentProjectVo != null) {
$scope.vm.form.parentProjects = [];
--
Gitblit v1.8.0