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

ItEr21S08CUVisualizacionModelosPlanificacionItErItEr20S10: Linked javascript dependency types with DependencyContainer enums

Browse source
This commit is contained in:
Lorenzo Tilve 2009-08-12 12:29:37 +02:00 • committed by Óscar González Fernández
parent fb4f5bc2d5
commit ec1fbef1b5
4 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
View file

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

2
navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp
View file

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

14
navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js
View file

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

27
navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js
View file

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