From 5fa194ebb680e5d813aa8ec9dd46ac16c0499fba Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 17 May 2010 10:32:55 +0200
Subject: [PATCH]  ItEr58S04ValidacionEProbasFuncionaisItEr57S04: Fixing bug.
 Vertical resize of watermarks in resourcesload list

---
 .../ganttz/resourceload/ResourceLoadList.java |  6 +++-
 .../web/ganttz/zul/resourcesLoadLayout.zul    |  4 +--
 .../ganttz/resourceload/resourcesloadlist.js  | 29 ++++++++++++++-----
 .../limitingResourcesLayout.zul               |  4 +--
 .../src/main/webapp/planner/order.zul         |  2 +-
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
index 34ba35504..c373d8f01 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
@@ -36,6 +36,7 @@ import org.zkoss.zk.au.out.AuInvoke;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.HtmlMacroComponent;
 import org.zkoss.zk.ui.ext.AfterCompose;
+import org.zkoss.zk.ui.util.Clients;
 
 /**
  * Component to include a list of ResourceLoads inside the ResourcesLoadPanel.
@@ -98,6 +99,8 @@ public class ResourceLoadList extends HtmlMacroComponent implements
         for (LoadTimeLine l : line.getAllChildren()) {
             getComponentFor(l).detach();
         }
+        Clients
+                .evalJavaScript("zkResourcesLoadList.recalculateTimetrackerHeight();");
     }
 
     private ResourceLoadComponent getComponentFor(LoadTimeLine l) {
@@ -118,7 +121,8 @@ public class ResourceLoadList extends HtmlMacroComponent implements
             insertBefore(child, nextSibling);
             nextSibling = child;
         }
-
+        Clients
+                .evalJavaScript("zkResourcesLoadList.recalculateTimetrackerHeight();");
     }
 
     private List<LoadTimeLine> getChildrenReverseOrderFor(LoadTimeLine line) {
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 6b36e72a0..9aa535a8e 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -60,7 +60,7 @@ resourcesLoadPanel = self;
                     splittable="true" autoscroll="true">
 
                     <borderlayout >
-                        <north border="0" height="38px" flex="true" collapsible="true">
+                        <north border="0" height="35px" flex="true" collapsible="true">
                             <vbox pack="top" align="center">
                             <tree fixedLayout="true">
                                 <treecols>
@@ -78,7 +78,7 @@ resourcesLoadPanel = self;
 
                 <center sclass="taskspanel">
                     <borderlayout>
-                        <north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker"></div></north>
+                        <north border="0"><div sclass="timetrackergap" height="30px" id="insertionPointTimetracker"></div></north>
                         <center autoscroll="true" border="0" sclass="rightpanellayout">
                             <div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
                         </center>
diff --git a/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js b/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js
index e548e544a..ce82e9133 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js
@@ -20,6 +20,24 @@
 
 zkResourcesLoadList = addResourcesLoadListMethods( {});
 
+zkResourcesLoadList.WATERMARK_MIN_HEIGHT = 450;
+zkResourcesLoadList.WATERMARK_MARGIN_BOTTOM = 40;
+
+function resourceloadlist() {
+	return YAHOO.util.Selector.query('.resourceloadlist')[0];
+}
+
+function firstWatermarkColumn() {
+	return YAHOO.util.Selector.query('.rightpanellayout tr#watermark td')[0];
+}
+
+zkResourcesLoadList.recalculateTimetrackerHeight = function (cmp) {
+	var height = Math.max(
+			resourceloadlist().clientHeight + zkResourcesLoadList.WATERMARK_MARGIN_BOTTOM,
+			zkResourcesLoadList.WATERMARK_MIN_HEIGHT);
+	firstWatermarkColumn().style.height = height + "px";
+}
+
 function addResourcesLoadListMethods(object) {
 	var scrollSync;
 
@@ -65,12 +83,10 @@ function addResourcesLoadListMethods(object) {
 				zkResourcesLoadList.adjustTimeTrackerSize, cmp);
 		scrollSync = new ScrollSync(cmp);
 		scrollSync.synchXChangeTo(timetracker);
-
 		listenToScroll();
 	};
 
 	function listenToScroll() {
-
 		var timetrackergap_ = timetrackergap();
 		var scrolledpannel_ = scrolledpannel();
 		var resourcesloadgraph_ = resourcesloadgraph();
@@ -88,17 +104,14 @@ function addResourcesLoadListMethods(object) {
 		rightpanel_.onscroll = onScroll;
 	}
 
+
 	object.adjustTimeTrackerSize = function(cmp) {
+		zkResourcesLoadList.recalculateTimetrackerHeight();
 		watermark().style["height"] = cmp.clientHeight + "px";
 		timetracker().style["width"] = cmp.clientWidth + "px";
 		/* Set watermark width */
 		YAHOO.util.Selector.query('.resourceloadlist')[0].style["width"] = YAHOO.util.Selector
-				.query('.second_level_')[0].clientWidth
-				+ "px";
-		YAHOO.util.Selector.query('.rightpanellayout tr#watermark td')[0].style["height"] =
-		/* Calculate min : taskspanelgap().clientHeight + 120 + 'px'; )  */
-		YAHOO.util.Selector.query('.resourceloadlist')[0].clientHeight + 120
-				+ "px";
+				.query('.second_level_')[0].clientWidth + "px";
 	};
 
 	object.adjustResourceLoadRows = function(cmp) {
diff --git a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
index 883d01600..5fc3a8daa 100644
--- a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
+++ b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
@@ -78,7 +78,7 @@ resourcesLoadPanel = self;
                     splittable="true" autoscroll="true">
 
                     <borderlayout >
-                        <north border="0" height="38px" flex="true" collapsible="true">
+                        <north border="0" height="35px" flex="true" collapsible="true">
                             <vbox pack="top" align="center">
                             <tree fixedLayout="true">
                                 <treecols>
@@ -96,7 +96,7 @@ resourcesLoadPanel = self;
 
                 <center sclass="taskspanel">
                     <borderlayout>
-                        <north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker"></div></north>
+                        <north border="0"><div sclass="timetrackergap" height="30px" id="insertionPointTimetracker"></div></north>
                         <center autoscroll="true" border="0" sclass="rightpanellayout">
                             <div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
                         </center>
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 780862710..2f10e974f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -62,7 +62,7 @@
     </div>
 
     <window id="editTaskWindow" apply="${editController}" border="normal"
-        width="870px" visible="false">
+        width="870px" visible="false" >
 
         <vbox id="messagesContainer" />