From c370dccc651175eb27c7c378f0802d098265ea6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 13 Jul 2012 10:44:32 +0200 Subject: [PATCH] Bug #1494: Deadline field disabled for subcontracted tasks, it corresponds to delivery date. FEA: ItEr76S04BugFixing --- .../java/org/libreplan/web/planner/order/SubcontractModel.java | 2 ++ .../web/planner/taskedition/TaskPropertiesController.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java index c0499d69b..af26bf949 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java @@ -141,6 +141,8 @@ public class SubcontractModel implements ISubcontractModel { } task.removeAllSatisfiedResourceAllocations(); + task.setDeadline(new LocalDate(currentSubcontractedTaskData + .getLastRequiredDeliverDate())); Task.convertOnStartInFixedDate(task); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java index b6f177fca..ad475fb10 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java @@ -99,6 +99,8 @@ public class TaskPropertiesController extends GenericForwardComposer { private Datebox endDateBox; + private Datebox deadLineDateBox; + private Combobox startConstraintTypes; private Datebox startConstraintDate; @@ -144,6 +146,7 @@ public class TaskPropertiesController extends GenericForwardComposer { startConstraintTypes.setDisabled(disabledConstraintsAndAllocations); startConstraintDate.setDisabled(disabledConstraintsAndAllocations); lbResourceAllocationType.setDisabled(disabledConstraintsAndAllocations); + deadLineDateBox.setDisabled(currentTaskElement.isSubcontracted()); if (context != null) { taskEditFormComposer.init(context.getRelativeTo(), context.getTask());