From 45db8c1c1ccd2eea1ae56a4924c12e6283d5f2bc Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 9 Dec 2009 09:13:13 +0100
Subject: [PATCH]  ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #153]
 Recovered zoom by day working on charts.

---
 .../java/org/navalplanner/web/planner/chart/Chart.java     | 7 +++++++
 .../org/navalplanner/web/planner/chart/ChartFiller.java    | 5 +++++
 .../org/navalplanner/web/planner/chart/IChartFiller.java   | 3 +++
 .../web/planner/company/CompanyPlanningModel.java          | 4 +++-
 .../navalplanner/web/planner/order/OrderPlanningModel.java | 2 ++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/Chart.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/Chart.java
index 609403691..bbb4cdd31 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/Chart.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/Chart.java
@@ -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);
+        }
+    }
+
 }
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 dc65676b6..bac08d6ad 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
@@ -561,4 +561,9 @@ public abstract class ChartFiller implements IChartFiller {
         chart.appendChild(plotinfo);
     }
 
+    @Override
+    public void setZoomLevel(ZoomLevel zoomLevel) {
+        this.zoomLevel = zoomLevel;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/IChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/IChartFiller.java
index d38fc245e..4df0e78aa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/IChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/IChartFiller.java
@@ -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);
+
 }
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 e580e3a49..798f337a6 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
@@ -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
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index 55946cc3c..bacd26019 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -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