RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #980] show warning in "Earned Value" tab for future dates.

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-05-18 11:18:30 +02:00
parent 5c90bf0398
commit 6fc94feca3
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -97,6 +97,7 @@ import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
import org.zkoss.ganttz.util.Interval; import org.zkoss.ganttz.util.Interval;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
@ -383,11 +384,21 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
vbox.removeChild(child); vbox.removeChild(child);
vbox.appendChild(getEarnedValueChartConfigurableLegend( vbox.appendChild(getEarnedValueChartConfigurableLegend(
earnedValueChartFiller, date)); earnedValueChartFiller, date));
dateInfutureMessage(datebox);
} }
}); });
} }
private void dateInfutureMessage(Datebox datebox) {
Date value = datebox.getValue();
Date today = LocalDate.fromDateFields(new Date())
.toDateTimeAtStartOfDay().toDate();
if (value != null && (value.compareTo(today) > 0)) {
throw new WrongValueException(datebox, _("date in future"));
}
}
public static void appendLoadChartAndLegend(Tabpanel loadChartPannel, public static void appendLoadChartAndLegend(Tabpanel loadChartPannel,
Timeplot loadChart) { Timeplot loadChart) {
Hbox hbox = new Hbox(); Hbox hbox = new Hbox();

10
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -772,6 +772,15 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
}; };
} }
private void dateInfutureMessage(Datebox datebox) {
Date value = datebox.getValue();
Date today = LocalDate.fromDateFields(new Date())
.toDateTimeAtStartOfDay().toDate();
if (value != null && (value.compareTo(today) > 0)) {
throw new WrongValueException(datebox, _("date in future"));
}
}
private void appendEventListenerToDateboxIndicators( private void appendEventListenerToDateboxIndicators(
final OrderEarnedValueChartFiller earnedValueChartFiller, final OrderEarnedValueChartFiller earnedValueChartFiller,
final Vbox vbox, final Datebox datebox) { final Vbox vbox, final Datebox datebox) {
@ -785,6 +794,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
vbox.removeChild(child); vbox.removeChild(child);
vbox.appendChild(getEarnedValueChartConfigurableLegend( vbox.appendChild(getEarnedValueChartConfigurableLegend(
earnedValueChartFiller, date)); earnedValueChartFiller, date));
dateInfutureMessage(datebox);
} }
}); });