From c151c10fc0e9177389787eb3f1d05f0ca2e6ca59 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 14 May 2010 10:31:39 +0200
Subject: [PATCH]  ItEr58S04ValidacionEProbasFuncionaisItEr57S04: Small fix on
 chart filler.

---
 .../web/planner/chart/ChartFiller.java        | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
index 12fd35d7f..37c398b56 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
@@ -204,13 +204,19 @@ public abstract class ChartFiller implements IChartFiller {
         }
 
         private void fillZeroValueFromStart(PrintWriter writer) {
-            printLine(writer, start, BigDecimal.ZERO);
-            if (startIsPreviousToPreviousDayToFirstAssignment()) {
-                printLine(writer, previousDayToFirstAssignment(),
-                        BigDecimal.ZERO);
+            if (!startIsDayOfFirstAssignment()) {
+                printLine(writer, start, BigDecimal.ZERO);
+                if (startIsPreviousToPreviousDayToFirstAssignment()) {
+                    printLine(writer, previousDayToFirstAssignment(),
+                            BigDecimal.ZERO);
+                }
             }
         }
 
+        private boolean startIsDayOfFirstAssignment() {
+            return !map.isEmpty() && start.compareTo(map.firstKey()) == 0;
+        }
+
         private boolean startIsPreviousToPreviousDayToFirstAssignment() {
             return !map.isEmpty()
                     && start.compareTo(previousDayToFirstAssignment()) < 0;
@@ -221,10 +227,17 @@ public abstract class ChartFiller implements IChartFiller {
         }
 
         private void fillZeroValueToFinish(PrintWriter writer) {
-            if (finishIsPosteriorToNextDayToLastAssignment()) {
-                printLine(writer, nextDayToLastAssignment(), BigDecimal.ZERO);
+            if (!finishIsDayOfLastAssignment()) {
+                if (finishIsPosteriorToNextDayToLastAssignment()) {
+                    printLine(writer, nextDayToLastAssignment(),
+                            BigDecimal.ZERO);
+                }
+                printLine(writer, finish, BigDecimal.ZERO);
             }
-            printLine(writer, finish, BigDecimal.ZERO);
+        }
+
+        private boolean finishIsDayOfLastAssignment() {
+            return !map.isEmpty() && start.compareTo(map.lastKey()) == 0;
         }
 
         private boolean finishIsPosteriorToNextDayToLastAssignment() {