From cd56d401c5233f24790a5be8ba4075a97ab80fe3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 19:20:08 +0900
Subject: [PATCH] 상위 프로젝트는 추가 못하도록 수정
---
src/main/webapp/scripts/app/project/projectModify.controller.js | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index 0342053..722b8ba 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
};
@@ -38,10 +39,12 @@
description : "",
managers : [], // 愿�由ъ옄
users : [], // �씪諛� �궗�슜�옄
+ departments : [], // 遺��꽌
startEndDateRange : ""
},
managerName : "", // 愿�由ъ옄 �씠由� 寃��깋
userName : "", // �씪諛� �궗�슜�옄 �씠由� 寃��깋
+ departmentName : "", // 遺��꽌 �씠由� 寃��깋
projectName : "", // �긽�쐞 �봽濡쒖젥�듃 �씠由� 寃��깋
autoCompletePage : {
manager : {
@@ -72,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);
@@ -92,15 +100,9 @@
return true;
}
- if ($scope.vm.form.startEndDateRange == "") {
- return true;
- }
-
if ($scope.vm.form.managers.length < 1) {
return true;
}
-
-
return false;
}
@@ -110,7 +112,7 @@
var content = {
id : $scope.vm.form.id,
- parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
+ //parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
name : $rootScope.preventXss($scope.vm.form.name),
status : $scope.vm.form.status,
startDate : "",
@@ -129,12 +131,24 @@
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();
- content.endDate = startEndDateRange[1].trim();
+ 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();
+ }
Project.modify($resourceProvider.getContent(
content,
@@ -168,10 +182,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