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

ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #153] Recovered zoom by day working on charts.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-12-09 09:13:13 +01:00 • committed by Javier Moran Rua
parent 70a1639cad
commit 45db8c1c1c
5 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/Chart.java
View file

@ -22,6 +22,7 @@ package org.navalplanner.web.planner.chart;
import org.apache.commons.lang.Validate;
import org.zkforge.timeplot.Timeplot;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
@ -47,4 +48,10 @@ public class Chart {
filler.fillChart(timeplot, timeTracker.getRealInterval(), timeTracker.getHorizontalSize());
}
public void setZoomLevel(ZoomLevel zoomLevel) {
if (zoomLevel != null) {
filler.setZoomLevel(zoomLevel);
}
}
}

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
View file

@ -561,4 +561,9 @@ public abstract class ChartFiller implements IChartFiller {
chart.appendChild(plotinfo);
}
@Override
public void setZoomLevel(ZoomLevel zoomLevel) {
this.zoomLevel = zoomLevel;
}
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/IChartFiller.java
View file

@ -32,6 +32,7 @@ import org.zkforge.timeplot.Plotinfo;
import org.zkforge.timeplot.Timeplot;
import org.zkforge.timeplot.geometry.TimeGeometry;
import org.zkforge.timeplot.geometry.ValueGeometry;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
import org.zkoss.ganttz.util.Interval;
/**
@ -65,4 +66,6 @@ public interface IChartFiller {
void appendPlotinfo(Timeplot chart, Plotinfo plotinfo, ValueGeometry valueGeometry,
TimeGeometry timeGeometry);
void setZoomLevel(ZoomLevel zoomLevel);
}

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

@ -495,7 +495,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
IZoomLevelChangedListener zoomListener = new IZoomLevelChangedListener() {
@Override
public void zoomLevelChanged(final ZoomLevel detailLevel) {
public void zoomLevelChanged(ZoomLevel detailLevel) {
loadChart.setZoomLevel(detailLevel);
transactionService
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
@Override

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

@ -572,6 +572,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
@Override
public void zoomLevelChanged(ZoomLevel detailLevel) {
loadChart.setZoomLevel(detailLevel);
transactionService
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
@Override