From 9acc18cd0eb8e96bd4191aa474677166458c9b95 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 22 Jan 2010 18:06:37 +0100 Subject: [PATCH] ItEr44S19CUExportacionUnidadePlanificacion: Overriding dates of root order element exporting a subcontracted task. --- .../web/subcontract/SubcontractedTasksModel.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java index c2c194a42..dad718fe0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java @@ -194,8 +194,18 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel { orderElement = orderElement.calculateOrderLineForSubcontract(); } - return OrderElementConverter.toDTO(orderElement, + OrderElementDTO orderElementDTO = OrderElementConverter.toDTO( + orderElement, getConfiguration(subcontractedTaskData)); + overrideDateInformationForRootNode(orderElementDTO, + subcontractedTaskData.getTask()); + return orderElementDTO; + } + + private void overrideDateInformationForRootNode( + OrderElementDTO orderElementDTO, Task task) { + orderElementDTO.initDate = task.getStartDate(); + orderElementDTO.deadline = task.getEndDate(); } private ConfigurationOrderElementConverter getConfiguration(