From c8b02d6db1909205f774200d1632c9d20bb47ea3 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Thu, 22 Oct 2009 09:23:22 +0200
Subject: [PATCH]  ItEr31S12ValidacionEProbasFuncionaisItEr30S17: Added year
 margin to advanced resourceload allocation spreadsheet to fit graphical
 component width

   * Pending to review behaviour with week granularity
---
 .../AdvancedAllocationController.java         | 19 ++++++++++++++++---
 .../src/main/webapp/planner/css/ganttzk.css   | 11 +++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 6f07e5b0b..7df075e82 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -44,7 +44,6 @@ import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.ViewSwitcher;
-import org.navalplanner.web.planner.allocation.AllocationResult;
 import org.navalplanner.web.resourceload.ResourceLoadModel;
 import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer;
 import org.zkoss.ganttz.timetracker.IConvertibleToColumn;
@@ -54,6 +53,8 @@ import org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.zoom.DetailItem;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.Interval;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
@@ -229,17 +230,22 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         insertComponentsInLayout();
         timeTrackerComponent.afterCompose();
         table.afterCompose();
-        Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
     }
 
     private void createComponents() {
-        timeTracker = new TimeTracker(intervalFromData());
+        timeTracker = new TimeTracker(addYearMarginTointerval());
         timeTrackerComponent = new TimeTrackerComponentWithoutColumns(
                 timeTracker, "timeTracker");
         TimeTrackedTableWithLeftPane<Row, Row> timeTrackedTableWithLeftPane = new TimeTrackedTableWithLeftPane<Row, Row>(
                 getDataSource(), getColumnsForLeft(), getLeftRenderer(),
                 getRightRenderer(), timeTracker);
 
+        timeTracker.addZoomListener(new IZoomLevelChangedListener() {
+            @Override
+            public void zoomLevelChanged(ZoomLevel detailLevel) {
+                Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
+            }
+        });
         table = timeTrackedTableWithLeftPane.getRightPane();
         leftPane = timeTrackedTableWithLeftPane.getLeftPane();
     }
@@ -404,6 +410,13 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         }
     }
 
+    private Interval addYearMarginTointerval() {
+        Interval interval = intervalFromData();
+        return new Interval(new DateTime(interval.getStart()).minusYears(1)
+                .toDate(), new DateTime(interval.getFinish()).plusYears(1)
+                .toDate());
+    }
+
     private LocalDate getEnd(List<ResourceAllocation<?>> all) {
         ArrayList<ResourceAllocation<?>> reversed = reverse(all);
         LocalDate end = reversed.get(0).getEndDate();
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 18cb37be7..65dfd1d11 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -560,6 +560,17 @@ div.z-tree {
     border-collapse: collapse;
 }
 
+.advancedallocationlayout .second_level_ th {
+    width:150px;
+}
+.advancedallocationlayout .taskspanelgap td.z-row-inner {
+    padding:0 !important;
+}
+.advancedallocationlayout .taskspanelgap td.z-row-inner input {
+    padding-top:2px;
+    padding-bottom:2px;
+}
+
 .taskspanelgap table {
     border-collapse: collapse;
 }