From d25c62b6ff3ef7637f9358cfb0782c6706c9b55d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 10:13:00 +0900
Subject: [PATCH] 이슈 메일 전송 이력 남기기 완료 * 바로 이력이 안남겨지는 문제 해결필요(현재 새로고침을 해야 이력이 보임)
---
src/main/webapp/scripts/app/project/projectAdd.controller.js | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index a729af7..0ea3ea5 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -16,6 +16,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
removeUsr : removeUsr, // �씪諛� �궗�슜�옄 �젣嫄�
+ removeDepartment : removeDepartment // 遺��꽌 �젣嫄�
};
$scope.vm = {
@@ -33,6 +34,7 @@
id : $rootScope.user.id
}], // 愿�由ъ옄
users : [], // �씪諛� �궗�슜�옄
+ departments : []
},
userName : "", // �씪諛� �궗�슜�옄 �씠由� 寃��깋
projectName : "", // �긽�쐞 �봽濡쒖젥�듃 �씠由� 寃��깋
@@ -62,12 +64,13 @@
$scope.vm.form.users.splice(index, 1);
}
+ // �떞�떦遺��꽌 �궘�젣
+ function removeDepartment(index) {
+ $scope.vm.form.departments.splice(index, 1);
+ }
+
function formCheck(formInvalid) {
if (formInvalid) {
- return true;
- }
-
- if (!$rootScope.isDefined($scope.vm.form.startEndDateRange)) {
return true;
}
@@ -93,16 +96,20 @@
});
return managerIds;
})(),
- userIds : (function () {
- var userIds = [];
- angular.forEach($scope.vm.form.users, function (user) {
- userIds.push(user.id);
+ // 遺��꽌 id 異붽� �븘�슂
+ departmentIds : (function () {
+ var departmentIds = [];
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
});
- return userIds;
+ return departmentIds;
})()
};
- if ($rootScope.isDefined($scope.vm.form.startEndDateRange)) {
+ if ($scope.vm.form.startEndDateRange === null || $scope.vm.form.startEndDateRange === "") {
+ content.startDate = "";
+ content.endDate = "";
+ } else {
var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
content.startDate = startEndDateRange[0].trim();
content.endDate = startEndDateRange[1].trim();
--
Gitblit v1.8.0