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

ItEr50S04ValidacionEProbasFuncionaisItEr49S04: [Bug #386] Fixing bug.

Browse source 
For the task group not constraint is generated. When calculating the
start of a task container the children must be taken into account so
it doesn't start at the start of the order. Also fixes bug #384.
This commit is contained in:
Óscar González Fernández 2010-03-15 13:28:24 +01:00
parent 418e01fffe
commit 9f10cfc47f
2 changed files with 86 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
View file

@ -234,29 +234,85 @@ public class GanttDiagramGraph implements ICriticalPathCalculable<Task> {
}
private void enforceStartDate(Set<Dependency> incoming) {
List<Constraint<Date>> dependencyConstraints = Dependency
.getStartConstraints(incoming);
Date newStart;
if (dependenciesConstraintsHavePriority) {
newStart = Constraint.<Date> initialValue(null)
.withConstraints(task
.getStartConstraints())
.withConstraints(dependencyConstraints)
.withConstraints(globalStartConstraints)
.apply();
} else {
newStart = Constraint.<Date> initialValue(null)
.withConstraints(dependencyConstraints)
.withConstraints(task
.getStartConstraints())
.withConstraints(globalStartConstraints)
.apply();
}
Date newStart = calculateStartDateFor(task, incoming);
Date childrenEarliest = getEarliestStartDateOfChildren(task);
newStart = maxNotNull(newStart, childrenEarliest);
if (!task.getBeginDate().equals(newStart)) {
task.setBeginDate(newStart);
}
}
private Date getEarliestStartDateOfChildren(Task task) {
if (!task.isContainer()) {
return null;
}
List<Date> startDates = getChildrenStartDates((TaskContainer) task);
if (!startDates.isEmpty()) {
return Collections.min(startDates);
}
return null;
}
private List<Date> getChildrenStartDates(TaskContainer container) {
List<Task> children = container.getTasks();
List<Date> startDates = new ArrayList<Date>();
for (Task each : children) {
Set<Dependency> incomingDependencies = withoutDependencyFrom(
container, graph.incomingEdgesOf(each));
Date dateWithoutContainerInfluence = calculateStartDateFor(
each, incomingDependencies);
if (dateWithoutContainerInfluence != null) {
startDates.add(dateWithoutContainerInfluence);
}
}
return startDates;
}
private Set<Dependency> withoutDependencyFrom(TaskContainer container,
Set<Dependency> incoming) {
Set<Dependency> result = new HashSet<Dependency>();
for (Dependency each : incoming) {
if (!each.getSource().equals(container)) {
result.add(each);
}
}
return result;
}
private Date maxNotNull(Date... dates) {
List<Date> list = new ArrayList<Date>();
for (Date each : dates) {
if (each != null) {
list.add(each);
}
}
if (list.isEmpty()) {
return null;
}
return Collections.max(list);
}
}
private Date calculateStartDateFor(Task task,
Set<Dependency> withDependencies) {
List<Constraint<Date>> dependencyConstraints = Dependency
.getStartConstraints(withDependencies);
Date newStart;
if (dependenciesConstraintsHavePriority) {
newStart = Constraint.<Date> initialValue(null)
.withConstraints(task.getStartConstraints())
.withConstraints(dependencyConstraints)
.withConstraints(globalStartConstraints)
.apply();
} else {
newStart = Constraint.<Date> initialValue(null)
.withConstraints(dependencyConstraints)
.withConstraints(task.getStartConstraints())
.withConstraints(globalStartConstraints)
.apply();
}
return newStart;
}
public void enforceAllRestrictions() {
@ -300,12 +356,18 @@ public class GanttDiagramGraph implements ICriticalPathCalculable<Task> {
ParentShrinkingEnforcer parentShrinkingEnforcer = new ParentShrinkingEnforcer(
(TaskContainer) task);
parentShrinkingEnforcerByTask.put(task, parentShrinkingEnforcer);
List<Dependency> dependenciesToAdd = new ArrayList<Dependency>();
for (Task child : task.getTasks()) {
addTask(child);
add(new Dependency(child, task, DependencyType.END_END, false));
add(new Dependency(task, child, DependencyType.START_START,
dependenciesToAdd.add(new Dependency(child, task,
DependencyType.END_END, false));
dependenciesToAdd.add(new Dependency(task, child,
DependencyType.START_START,
false));
}
for (Dependency each : dependenciesToAdd) {
add(each);
}
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

@ -504,9 +504,11 @@ public class TaskElementAdapter implements ITaskElementAdapter {
default:
throw new RuntimeException("can't handle " + constraintType);
}
} else {
} else if (taskElement.isMilestone()) {
return Collections.singletonList(DateConstraint
.biggerOrEqualThan(taskElement.getStartDate()));
} else {
return Collections.emptyList();
}
}