RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #814] Fix bug

Browse source 
Dependencies start in limiting resources is now moved to the right corner of the queue element and vertically aligned with it.

FEA: ItEr70S04BugFixing
This commit is contained in:
Lorenzo Tilve 2011-02-14 17:14:25 +01:00
parent 0413e0b3e1
commit 304a0d7002
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js
View file

@ -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);
}
}

3
navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependencylist.js
View file

@ -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;