From 304a0d700243f528eaa4358af570e90f74b4cca6 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Mon, 14 Feb 2011 17:14:25 +0100 Subject: [PATCH] [Bug #814] Fix bug Dependencies start in limiting resources is now moved to the right corner of the queue element and vertically aligned with it. FEA: ItEr70S04BugFixing --- .../limitingresources/limitingdependency.js | 20 ++++++------------- .../limitingdependencylist.js | 3 ++- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js index 67a9f7f60..69a59e409 100644 --- a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js +++ b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js @@ -43,9 +43,11 @@ zkLimitingDependency.destination = function(dependency) { /* ----------- Generic Limiting dependency draw function ---------- */ zkLimitingDependencies.newdraw = function(arrow, orig, dest, param) { var xorig = orig[0]; - var yorig = orig[1] - zkLimitingDependencies.CORNER; + var yorig = orig[1]; var xend = dest[0]; - var yend = dest[1] - zkLimitingDependencies.CORNER; + var yend = dest[1]; + + var width = Math.abs(xend - xorig); if (yend == yorig) { yend = yend + zkLimitingDependencies.HEIGHT; @@ -56,7 +58,6 @@ zkLimitingDependencies.newdraw = function(arrow, orig, dest, param) { yorig = yorig + zkLimitingDependencies.HEIGHT; } - var width = Math.abs(xend - xorig); var height = Math.abs(yorig - yend); // --------- First segment ----------- @@ -125,17 +126,8 @@ zkLimitingDependency.draw = function(dependency) { if ( (posOrig != null) && (posDest != null) ) { var orig = zkLimitingDependencies.findPos(posOrig); var dest = zkLimitingDependencies.findPos(posDest); - - var verticalSeparation = 15; - switch (dependency.getAttribute('type')) { - case zkLimitingDependencies.constants.START_START: - verticalSeparation = 20; - orig[0] = orig[0] - zkLimitingDependencies.CORNER; - dest[0] = dest[0] - zkLimitingDependencies.CORNER; - break; - case zkLimitingDependencies.constants.END_END: - verticalSeparation = 25; - } + orig[0] = Math.max(orig[0], orig[0] + this.origin(dependency).offsetWidth - zkLimitingDependencies.CORNER); + var verticalSeparation = zkLimitingDependencies.ROW_HEIGHT; zkLimitingDependencies.newdraw(dependency, orig, dest, verticalSeparation); } } diff --git a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependencylist.js b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependencylist.js index 26132728e..2acb98a6d 100644 --- a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependencylist.js +++ b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependencylist.js @@ -32,7 +32,8 @@ zkLimitingDependencies.constants = { END_END: "END_END" }; -zkLimitingDependencies.CORNER = 4; +zkLimitingDependencies.CORNER = 10; +zkLimitingDependencies.ROW_HEIGHT = 15; zkLimitingDependencies.HEIGHT = 12; zkLimitingDependencies.ARROW_PADDING = 10; zkLimitingDependencies.HALF_ARROW_PADDING = 5;