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

ItEr22S13RFComportamentoGraficoPlanificadorItEr19S07: Moving constants from dependency.js to planner.js

Browse source 
There was a failure at scheduling when adding a dependency when there are no previous dependencies because zkDependency would not be loaded.
This commit is contained in:
Óscar González Fernández 2009-08-23 13:37:36 +02:00
parent 9e6e84bf35
commit 728d6e7666
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ganttzk/src/main/resources/web/js/ganttz/dependency.js
View file

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

11
ganttzk/src/main/resources/web/js/ganttz/planner.js
View file

@ -53,6 +53,11 @@ function ScrollSync(element){
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
*/
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);
}