From 728d6e7666e97c299dceed2128c5aeb024131136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 23 Aug 2009 13:37:36 +0200 Subject: [PATCH] ItEr22S13RFComportamentoGraficoPlanificadorItEr19S07: Moving constants from dependency.js to planner.js There was a failure at scheduling when adding a dependency when there are no previous dependencies because zkDependency would not be loaded. --- .../src/main/resources/web/js/ganttz/dependency.js | 8 ++------ ganttzk/src/main/resources/web/js/ganttz/planner.js | 11 ++++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ganttzk/src/main/resources/web/js/ganttz/dependency.js b/ganttzk/src/main/resources/web/js/ganttz/dependency.js index e0df24898..0072f9bc3 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/dependency.js +++ b/ganttzk/src/main/resources/web/js/ganttz/dependency.js @@ -6,10 +6,6 @@ */ zkDependency = {}; -zkDependency.END_START = "END_START"; -zkDependency.START_START = "START_START"; -zkDependency.END_END = "END_END"; - zkDependency.origin = function(dependency) { var id = dependency.getAttribute("idTaskOrig"); return document.getElementById(id); @@ -31,10 +27,10 @@ zkDependency.draw = function(dependency) { if (separation > 0) { offsetX = offsetX - separation; } - if (dependency.getAttribute('type') == zkDependency.END_START + if (dependency.getAttribute('type') == zkPlanner.constants.END_START || dependency.getAttribute('type') == null) { orig[0] = orig[0] + Math.max(0, offsetX); - } else if (dependency.getAttribute('type') == zkDependency.END_END) { + } else if (dependency.getAttribute('type') == zkPlanner.constants.END_END) { orig[0] = orig[0] + this.origin(dependency).offsetWidth; dest[0] = dest[0] + this.destination(dependency).offsetWidth; } diff --git a/ganttzk/src/main/resources/web/js/ganttz/planner.js b/ganttzk/src/main/resources/web/js/ganttz/planner.js index 65ccf7a24..e7878b8f7 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/planner.js +++ b/ganttzk/src/main/resources/web/js/ganttz/planner.js @@ -53,6 +53,11 @@ function ScrollSync(element){ * @author Lorenzo Tilve Álvaro */ zkPlanner = {}; +zkPlanner.constants = { + END_START: "END_START", + START_START: "START_START", + END_END: "END_END" +}; zkPlanner.getImagesDir = function() { return webapp_context_path + "/zkau/web/ganttz/img/"; @@ -107,13 +112,13 @@ zkPlanner.setupArrow = function(arrowDiv){ zkPlanner.drawArrow = function(dependency, orig, dest) { switch(dependency.getAttribute('type')) { - case zkDependency.START_START: + case zkPlanner.constants.START_START: zkPlanner.drawArrowStartStart(dependency, orig, dest); break; - case zkDependency.END_END: + case zkPlanner.constants.END_END: zkPlanner.drawArrowEndEnd(dependency, orig, dest); break; - case zkDependency.END_START: + case zkPlanner.constants.END_START: default: zkPlanner.drawArrowEndStart(dependency, orig, dest); }