From e89d431fdd5864645b8253fd354b68f313fef6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 14 Sep 2009 13:19:11 +0200 Subject: [PATCH] ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07: ResourcesPerDayUnit can be converted to hours given the hours of the working day --- .../planner/entities/GenericResourceAllocation.java | 2 +- .../business/planner/entities/ResourcePerDayUnit.java | 6 +++++- .../test/planner/entities/ResourcePerDayUnitTest.java | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index f5dff3046..acb1a4793 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -130,7 +130,7 @@ public class GenericResourceAllocation extends ResourceAllocation { } Integer workableHours = SameWorkHoursEveryDay .getDefaultWorkingDay().getWorkableHours(day); - return resourcesPerDay.getAmount() * workableHours; + return resourcesPerDay.asHoursGivenResourceWorkingDayOf(workableHours); } private boolean isTaskFreeDay(LocalDate day) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcePerDayUnit.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcePerDayUnit.java index 1fc372c81..fdc0f62f0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcePerDayUnit.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcePerDayUnit.java @@ -8,7 +8,6 @@ public class ResourcePerDayUnit { public static ResourcePerDayUnit amount(int amount) { return new ResourcePerDayUnit(amount); - } private ResourcePerDayUnit(int amount) { @@ -19,4 +18,9 @@ public class ResourcePerDayUnit { public int getAmount() { return amount; } + + public int asHoursGivenResourceWorkingDayOf( + Integer resourceWorkingDayHours) { + return getAmount() * resourceWorkingDayHours; + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcePerDayUnitTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcePerDayUnitTest.java index 848329084..09451fffd 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcePerDayUnitTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcePerDayUnitTest.java @@ -19,4 +19,10 @@ public class ResourcePerDayUnitTest { assertThat(units.getAmount(), equalTo(2)); } + @Test + public void canBeConvertedToHoursGivenTheWorkingDayHours() { + ResourcePerDayUnit units = ResourcePerDayUnit.amount(2); + assertThat(units.asHoursGivenResourceWorkingDayOf(8), equalTo(16)); + } + }