From 4c555d2510bdb2ddcc2b0664ed0ec5d304a057a7 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 15 Oct 2009 10:40:55 +0200
Subject: [PATCH]  ItEr30S11CUVistaRecursosTempoEmpresaItEr29S13: Using day
 granularity when the zoom level is DETAIL_FIVE.

---
 .../web/planner/CompanyPlanningModel.java     | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
index 3123712f2..dbc4881d0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
@@ -94,6 +94,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
 
     private Integer maximunValueForChart = 0;
 
+    private IZoomLevelChangedListener zoomListener;
+
+    private ZoomLevel zoomLevel = ZoomLevel.DETAIL_ONE;
+
     private final class TaskElementNavigator implements
             IStructureNavigator<TaskElement> {
         @Override
@@ -145,15 +149,15 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         fillChartOnZoomChange(chartComponent, timeTracker);
     }
 
-    private IZoomLevelChangedListener zoomListener;
-
     private void fillChartOnZoomChange(final Timeplot chartComponent,
             final TimeTracker timeTracker) {
 
         zoomListener = new IZoomLevelChangedListener() {
 
             @Override
-            public void zoomLevelChanged(ZoomLevel detailLevel) {
+            public void zoomLevelChanged(final ZoomLevel detailLevel) {
+                zoomLevel = detailLevel;
+
                 transactionService
                         .runOnReadOnlyTransaction(new IOnTransaction<Void>() {
                     @Override
@@ -387,7 +391,11 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
             }
         }
 
-        return groupByWeek(map);
+        if (zoomLevel.equals(ZoomLevel.DETAIL_FIVE)) {
+            return map;
+        } else {
+            return groupByWeek(map);
+        }
     }
 
     private SortedMap<LocalDate, Integer> calculateHoursAdditionByDay(
@@ -412,7 +420,11 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
             map.put(date, hours);
         }
 
-        return groupByWeek(map);
+        if (zoomLevel.equals(ZoomLevel.DETAIL_FIVE)) {
+            return map;
+        } else {
+            return groupByWeek(map);
+        }
     }
 
     private SortedMap<LocalDate, Integer> groupByWeek(