diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 6b32bd271..cdb238b49 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -32,10 +32,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import org.joda.time.LocalDate; import org.navalplanner.business.calendars.entities.BaseCalendar; @@ -67,8 +67,8 @@ import org.navalplanner.web.planner.ITaskElementAdapter; import org.navalplanner.web.planner.chart.Chart; import org.navalplanner.web.planner.chart.ChartFiller; import org.navalplanner.web.planner.chart.EarnedValueChartFiller; -import org.navalplanner.web.planner.chart.IChartFiller; import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType; +import org.navalplanner.web.planner.chart.IChartFiller; import org.navalplanner.web.planner.order.BankHolidaysMarker; import org.navalplanner.web.planner.order.OrderPlanningModel; import org.navalplanner.web.planner.tabs.MultipleTabsPlannerController; @@ -359,8 +359,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { Hbox dateHbox = new Hbox(); dateHbox.appendChild(new Label(_("Select date:"))); - LocalDate date = new LocalDate(); - Datebox datebox = new Datebox(date.toDateTimeAtStartOfDay().toDate()); + LocalDate initialDate = earnedValueChartFiller + .initialDateForIndicatorValues(); + Datebox datebox = new Datebox(initialDate.toDateTimeAtStartOfDay() + .toDate()); dateHbox.appendChild(datebox); appendEventListenerToDateboxIndicators(earnedValueChartFiller, vbox, @@ -368,7 +370,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { vbox.appendChild(dateHbox); vbox.appendChild(getEarnedValueChartConfigurableLegend( - earnedValueChartFiller, date)); + earnedValueChartFiller, initialDate)); Hbox hbox = new Hbox(); hbox.setSclass("earned-value-chart");