From f7461e2e82a6f4373fade84ffeda147c06d41133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 28 Dec 2009 13:51:47 +0100 Subject: [PATCH] ItEr41S09RFSoporteRecursosVirtuaisItEr40S12: Taking into account the capacity --- .../business/calendars/entities/ResourceCalendar.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 0857b6bf5..828321666 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 @@ -63,7 +63,14 @@ public class ResourceCalendar extends BaseCalendar { if (!isActive(date)) { return 0; } - return super.getWorkableHours(date); + return multiplyByCapacity(super.getWorkableHours(date)); + } + + private Integer multiplyByCapacity(Integer workableHours) { + if (capacity == null) { + return workableHours; + } + return capacity * workableHours; } @AssertTrue(message = "Capacity must be a positive integer number")