Bug #1357: Small code rewrite to simplify the fix of the bug
FEA: ItEr76S04BugFixing
This commit is contained in:
parent
60b771784e
commit
a5484c2fe0
1 changed files with 17 additions and 19 deletions
|
|
@ -452,8 +452,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
|
|||
//update earned value chart
|
||||
earnedValueChart.fillChart();
|
||||
//update earned value legend
|
||||
updateEarnedValueChartLegend(new LocalDate(
|
||||
earnedValueChartLegendDatebox.getRawValue()));
|
||||
updateEarnedValueChartLegend();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
@ -529,15 +528,15 @@ public class OrderPlanningModel implements IOrderPlanningModel {
|
|||
Hbox dateHbox = new Hbox();
|
||||
dateHbox.appendChild(new Label(_("Select date")));
|
||||
|
||||
LocalDate initialDateForIndicatorValues = earnedValueChartFiller.initialDateForIndicatorValues();
|
||||
Datebox datebox = new Datebox(initialDateForIndicatorValues
|
||||
LocalDate initialDateForIndicatorValues =
|
||||
earnedValueChartFiller.initialDateForIndicatorValues();
|
||||
this.earnedValueChartLegendDatebox = new Datebox(initialDateForIndicatorValues
|
||||
.toDateTimeAtStartOfDay().toDate());
|
||||
this.earnedValueChartLegendDatebox = datebox;
|
||||
datebox.setConstraint(dateMustBeInsideVisualizationArea(earnedValueChartFiller));
|
||||
dateHbox.appendChild(datebox);
|
||||
this.earnedValueChartLegendDatebox.setConstraint(
|
||||
dateMustBeInsideVisualizationArea(earnedValueChartFiller));
|
||||
dateHbox.appendChild(this.earnedValueChartLegendDatebox);
|
||||
|
||||
appendEventListenerToDateboxIndicators(earnedValueChartFiller, vbox,
|
||||
datebox);
|
||||
appendEventListenerToDateboxIndicators(earnedValueChartFiller, vbox);
|
||||
vbox.appendChild(dateHbox);
|
||||
|
||||
vbox.appendChild(getEarnedValueChartConfigurableLegend(
|
||||
|
|
@ -804,20 +803,21 @@ public class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
private void appendEventListenerToDateboxIndicators(
|
||||
final OrderEarnedValueChartFiller earnedValueChartFiller,
|
||||
final Vbox vbox, final Datebox datebox) {
|
||||
datebox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||
final Vbox vbox) {
|
||||
earnedValueChartLegendDatebox.addEventListener(Events.ON_CHANGE,
|
||||
new EventListener() {
|
||||
|
||||
@Override
|
||||
public void onEvent(Event event) {
|
||||
LocalDate date = new LocalDate(datebox.getValue());
|
||||
updateEarnedValueChartLegend(date);
|
||||
dateInfutureMessage(datebox);
|
||||
updateEarnedValueChartLegend();
|
||||
dateInfutureMessage(earnedValueChartLegendDatebox);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private void updateEarnedValueChartLegend(LocalDate date) {
|
||||
private void updateEarnedValueChartLegend() {
|
||||
LocalDate date = new LocalDate(earnedValueChartLegendDatebox.getRawValue());
|
||||
org.zkoss.zk.ui.Component child = earnedValueChartLegendContainer
|
||||
.getFellow("indicatorsTable");
|
||||
earnedValueChartLegendContainer.removeChild(child);
|
||||
|
|
@ -956,8 +956,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
|
|||
if (planner.isVisibleChart()) {
|
||||
loadChart.fillChart();
|
||||
if(updateEarnedValueChartLegend) {
|
||||
updateEarnedValueChartLegend(new LocalDate(
|
||||
earnedValueChartLegendDatebox.getRawValue()));
|
||||
updateEarnedValueChartLegend();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1168,8 +1167,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
|
|||
if (planner.isVisibleChart()) {
|
||||
loadChart.fillChart();
|
||||
if (updateEarnedValueChartLegend) {
|
||||
updateEarnedValueChartLegend(new LocalDate(
|
||||
earnedValueChartLegendDatebox.getRawValue()));
|
||||
updateEarnedValueChartLegend();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue