From fb4f5bc2d532033a59f1fb37ead46254c813806d Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 12 Aug 2009 12:29:36 +0200
Subject: [PATCH]  ItEr21S08CUVisualizacionModelosPlanificacionItErItEr20S10:
 Added static atribute to dependency.dsp to set dependency type

---
 .../src/main/resources/web/ganttz/dependency.dsp    |  6 ++++--
 .../src/main/resources/web/js/ganttz/planner.js     | 13 +++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
index 2bf6b78c5..d34e6360d 100644
--- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
+++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
@@ -3,5 +3,7 @@
 
 <c:set var="self" value="${requestScope.arg.self}"/>
 
-<div class="dependency" id="${self.uuid}" z.type="ganttz.dependency.Dependency" idTaskOrig="${self.idTaskOrig}"  idTaskEnd="${self.idTaskEnd}" ${self.outerAttrs}">    
-</div>
+<div class="dependency" id="${self.uuid}" z.type="ganttz.dependency.Dependency"
+    idTaskOrig="${self.idTaskOrig}" idTaskEnd="${self.idTaskEnd}" ${self.outerAttrs}
+    type="start_end">
+</div>
\ No newline at end of file
diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js
index dcae07d95..2a0e63645 100644
--- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js
+++ b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js
@@ -50,11 +50,11 @@ zkPlanner.setupArrow = function(arrowDiv){
     }
 }
 
-zkPlanner.drawArrow = function(arrow, orig, dest){
-    var xorig = orig[0] - zkTask.CORNER_WIDTH/2;
-    var yorig = orig[1] - zkTask.CORNER_WIDTH/2;
-    var xend = dest[0];
-    var yend = dest[1];
+zkPlanner.drawArrowStartStart = function(arrow, orig, dest){
+    var xorig = orig[0] - zkTask.HALF_DEPENDENCY_PADDING;
+    var yorig = orig[1] - zkTask.CORNER_WIDTH/2 + zkTask.HALF_DEPENDENCY_PADDING;
+    var xend = dest[0] + zkTask.HALF_DEPENDENCY_PADDING;
+    var yend = dest[1] - zkTask.DEPENDENCY_PADDING;
 
     width1 = zkTask.CORNER_WIDTH;
     width2 = Math.abs(xend - xorig) + zkTask.CORNER_WIDTH;
@@ -100,7 +100,8 @@ zkPlanner.drawArrow = function(dependency, orig, dest) {
 	switch(dependency.getAttribute('type'))
     {
 	case zkDependency.START_START: 
-		zkPlanner.drawArrowStartEnd(dependency, orig, dest);
+		zkPlanner.drawArrowStartStart(dependency, orig, dest);
+		break;
 	case zkDependency.START_END:
 	default:		
 		zkPlanner.drawArrowStartEnd(dependency, orig, dest);