From d5e4fa5d338736d17a6bf487a1a69c8a2c5c75ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 14 Oct 2010 12:21:49 +0200 Subject: [PATCH] When copying a day assignmnet pass the effort duration not the hours Otherwise some of the duration is lost. FEA: ItEr62S05BugFixing --- .../business/planner/entities/GenericDayAssignment.java | 4 ++-- .../business/planner/entities/SpecificDayAssignment.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java index f5ac28478..309c4fd45 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java @@ -155,8 +155,8 @@ public class GenericDayAssignment extends DayAssignment { private static GenericDayAssignment copyFromWithoutParent( GenericDayAssignment toBeCopied) { - GenericDayAssignment copy = create(toBeCopied.getDay(), toBeCopied - .getHours(), toBeCopied.getResource()); + GenericDayAssignment copy = create(toBeCopied.getDay(), + toBeCopied.getDuration(), toBeCopied.getResource()); copy.setConsolidated(toBeCopied.isConsolidated()); return copy; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java index f3904ddfd..360641c87 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java @@ -137,9 +137,8 @@ public class SpecificDayAssignment extends DayAssignment { private static SpecificDayAssignment copyFromWithoutParent( SpecificDayAssignment assignment) { - SpecificDayAssignment copy = create(assignment.getDay(), assignment - .getHours(), assignment - .getResource()); + SpecificDayAssignment copy = create(assignment.getDay(), + assignment.getDuration(), assignment.getResource()); copy.setConsolidated(assignment.isConsolidated()); return copy; }