From 76e361bcdff2f4e51b50667e0c6c0261cb242daa Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 8 Dec 2009 20:27:45 +0100
Subject: [PATCH]  ItEr37S14CUVistaRecursosTempoEmpresaItEr36S16: Automatic
 scrolling of horizontal chart after recalculations

---
 ganttzk/src/main/resources/web/js/ganttz/tasklist.js   | 10 ++++++++++
 .../web/planner/company/CompanyPlanningModel.java      |  5 +++++
 .../web/planner/order/OrderPlanningModel.java          |  7 ++++++-
 .../src/main/webapp/common/css/navalpro_zk.css         |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js
index 731766bd7..6ef0cc8c4 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js
@@ -79,6 +79,16 @@ zkTasklist.hideTooltip = function(elem) {
 	document.getElementById(elem).style["display"] = "none";
 }
 
+zkTasklist.timeplotcontainer_rescroll = function(elem) {
+	var timeplotcontainer_all_ = YAHOO.util.Selector.query('.timeplot-canvas');
+	var scrolledpannel_ = scrolledpannel();
+	for (j=0;j<timeplotcontainer_all_.length;j++) {
+		timeplotcontainer_all_[j].style["left"] = "-" + scrolledpannel_.scrollLeft + "px";
+	}
+}
+
+
+
 function scrolledpannel() {
 	return YAHOO.util.Selector.query('.rightpanellayout div')[0];
 }
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 7d301ef43..c2c05b940 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
@@ -84,6 +84,7 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Div;
@@ -606,6 +607,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         public void fillChart(Timeplot chart, Interval interval, Integer size) {
             chart.getChildren().clear();
             chart.invalidate();
+
+            String javascript = "zkTasklist.timeplotcontainer_rescroll();";
+            Clients.evalJavaScript(javascript);
+
             resetMinimumAndMaximumValueForChart();
 
             Plotinfo plotInfoLoad = createPlotinfo(getLoad(interval.getStart(),
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 ab8a0cc8b..c04f7259f 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
@@ -91,6 +91,7 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Div;
@@ -115,7 +116,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
     public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // Green
     public static final String COLOR_OVERLOAD_GLOBAL = "#FDBE13"; // Orange
 
-    public static final String COLOR_ASSIGNED_LOAD_SPECIFIC = "#aa80d5"; // Violet
+    public static final String COLOR_ASSIGNED_LOAD_SPECIFIC = "#AA80d5"; // Violet
     public static final String COLOR_OVERLOAD_SPECIFIC = "#FF5A11"; // Red
 
     @Autowired
@@ -716,6 +717,10 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         public void fillChart(Timeplot chart, Interval interval, Integer size) {
             chart.getChildren().clear();
             chart.invalidate();
+
+            String javascript = "zkTasklist.timeplotcontainer_rescroll();";
+            Clients.evalJavaScript(javascript);
+
             resetMinimumAndMaximumValueForChart();
 
             List<DayAssignment> orderDayAssignments = order.getDayAssignments();
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index f5a11c98c..8b602af06 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -740,7 +740,7 @@ div.z-grid {
 }
 
 .legend .other {
-    background-color:#7f007f;
+    background-color: #AA80d5; /* COLOR_ASSIGNED_LOAD_SPECIFIC */
     height:10px;
     width:25px;
     margin-bottom:2px;