From b1995f3b8ec399a073007efd311dfa7bb6bc3c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 30 Aug 2010 15:53:03 +0200 Subject: [PATCH] Use #getCapacityDurationAt for calculating the capacity between two dates FEA: ItEr60S19TimeUnitDataType --- .../business/calendars/entities/ResourceCalendar.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java index 73451b500..2af7fdd02 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java @@ -66,12 +66,12 @@ public class ResourceCalendar extends BaseCalendar { } public Integer getCapacity(LocalDate from, LocalDate to) { - Integer result = getCapacityAt(to); + EffortDuration result = getCapacityDurationAt(to); for (LocalDate date = from; date.isBefore(to);) { - result += getCapacityAt(date); + result = result.plus(getCapacityDurationAt(date)); date = date.plusDays(1); } - return result; + return roundToHours(result); } @Override