From 4cdc3a0f3dacefffb5a991173295d9a8be43d685 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 7 Dec 2009 11:36:56 +0100 Subject: [PATCH] ItEr38S15CUAsignacionCalendarioLaboralRecursoItEr37S20: Show "0" instead of "D" in calendar summary when it is not derived. --- .../web/calendars/BaseCalendarEditionController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index e85219d26..24973b850 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -641,7 +641,11 @@ public abstract class BaseCalendarEditionController extends for (Days day : Days.values()) { Integer hours = calendarData.getHours(day); if (hours == null) { - summary.add("D"); + if (parent == null) { + summary.add("0"); + } else { + summary.add("D"); + } } else { summary.add(hours.toString()); }