From 6abcf566f903047ea12eaebeb3e916dee9827527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 4 Feb 2010 12:28:39 +0100 Subject: [PATCH] ItEr46S12CUVisualizacionResponsabilidadesTRaballoNaPlanificacion: Calendar#toHours must return zero hours if the availability is zero. --- .../navalplanner/business/calendars/entities/BaseCalendar.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 2401ae24e..37206f033 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -263,6 +263,9 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { } private Integer getWorkableHours(LocalDate date) { + if (!isActive(date)) { + return 0; + } CalendarException exceptionDay = getExceptionDay(date); if (exceptionDay != null) { return exceptionDay.getHours();