From ec1fbef1b5034accb81e7bc84dc356b7b26674eb Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 12 Aug 2009 12:29:37 +0200
Subject: [PATCH]  ItEr21S08CUVisualizacionModelosPlanificacionItErItEr20S10:
 Linked javascript dependency types with DependencyContainer enums

---
 .../org/zkoss/ganttz/DependencyComponent.java | 15 +++++------
 .../main/resources/web/ganttz/dependency.dsp  |  2 +-
 .../resources/web/js/ganttz/dependency.js     | 14 +++++++---
 .../main/resources/web/js/ganttz/planner.js   | 27 +++++++++----------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
index f29facf2c..94ceb4b93 100644
--- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
+++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package org.zkoss.ganttz;
 
 import java.beans.PropertyChangeEvent;
@@ -16,9 +11,9 @@ import org.zkoss.zk.ui.ext.AfterCompose;
 import org.zkoss.zul.impl.XulElement;
 
 /**
- *
- * @author Francisco Javier Moran Rúa
- *
+ * 
+ * @author Francisco Javier Moran Rúa <jmoran@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 public class DependencyComponent extends XulElement implements AfterCompose {
 
@@ -108,4 +103,8 @@ public class DependencyComponent extends XulElement implements AfterCompose {
                 .getTask(), DependencyType.END_START);
     }
 
+    public String getDependencyType() {
+        return this.getDependency().getType().name().toString();
+    }
+
 }
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 d34e6360d..fab9663e5 100644
--- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
+++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
@@ -5,5 +5,5 @@
 
 <div class="dependency" id="${self.uuid}" z.type="ganttz.dependency.Dependency"
     idTaskOrig="${self.idTaskOrig}" idTaskEnd="${self.idTaskEnd}" ${self.outerAttrs}
-    type="start_end">
+    type=${self.dependencyType}>
 </div>
\ No newline at end of file
diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js
index 9272ff308..ea037a471 100644
--- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js
+++ b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js
@@ -1,8 +1,14 @@
+/**
+ * Javascript behaviuor for TaskList elements
+ * @author Javier Morán Rúa <jmoran@igalia.com>
+ * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
+ */
 zkDependency = {};
 
-zkDependency.START_END = "start_end";
-zkDependency.START_START = "start_start";
-zkDependency.END_END = "end_end";
+zkDependency.END_START = "END_START";
+zkDependency.START_START = "START_START";
+zkDependency.END_END = "END_END";
 
 zkDependency.origin = function(dependency) {
     var id = dependency.getAttribute("idTaskOrig");
@@ -25,7 +31,7 @@ zkDependency.draw = function(dependency) {
     if (separation > 0 ) {
         offsetX = offsetX - separation;
     }
-    if (dependency.getAttribute('type') == zkDependency.START_END ||
+    if (dependency.getAttribute('type') == zkDependency.END_START ||
     		dependency.getAttribute('type') == null ) {
     	orig[0] = orig[0] + Math.max( 0, offsetX );
     }
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 2a0e63645..3fd46a0a2 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,6 +50,18 @@ zkPlanner.setupArrow = function(arrowDiv){
     }
 }
 
+zkPlanner.drawArrow = function(dependency, orig, dest) {
+	switch(dependency.getAttribute('type'))
+    {
+	case zkDependency.START_START: 
+		zkPlanner.drawArrowStartStart(dependency, orig, dest);
+		break;
+	case zkDependency.END_START:
+	default:		
+		zkPlanner.drawArrowEndStart(dependency, orig, dest);				
+    }
+}
+
 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;
@@ -95,20 +107,7 @@ zkPlanner.drawArrowStartStart = function(arrow, orig, dest){
     }
 
 
-zkPlanner.drawArrow = function(dependency, orig, dest) {
-
-	switch(dependency.getAttribute('type'))
-    {
-	case zkDependency.START_START: 
-		zkPlanner.drawArrowStartStart(dependency, orig, dest);
-		break;
-	case zkDependency.START_END:
-	default:		
-		zkPlanner.drawArrowStartEnd(dependency, orig, dest);				
-    }
-}
-
-zkPlanner.drawArrowStartEnd = function(arrow, orig, dest){
+zkPlanner.drawArrowEndStart = function(arrow, orig, dest){
     var xorig = orig[0] - zkTask.DEPENDENCY_PADDING;
     var yorig = orig[1] - zkTask.HALF_DEPENDENCY_PADDING;
     var xend = dest[0] - zkTask.DEPENDENCY_PADDING;