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

Bug #1320: Fix issue changing methods to get constraints for a task

Browse source 
When the start or end constraints for a task are requested, if it's a container,
it'll return the constraints of the children elements too. Except for the case
of the root task (the project) in order to avoid regression described in bug

FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-09-19 16:30:29 +02:00
parent 1d0d40f449
commit 8a98bf4666
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -120,6 +120,7 @@ public class TaskElementAdapter {
public static List<Constraint<GanttDate>> getStartConstraintsFor(
TaskElement taskElement, LocalDate orderInitDate) {
List<Constraint<GanttDate>> constraints = new ArrayList<Constraint<GanttDate>>();
if (taskElement instanceof ITaskPositionConstrained) {
ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement;
TaskPositionConstraint startConstraint = task
@ -129,25 +130,31 @@ public class TaskElementAdapter {
switch (constraintType) {
case AS_SOON_AS_POSSIBLE:
if (orderInitDate != null) {
return Collections
.singletonList(biggerOrEqualThan(toGantt(orderInitDate)));
constraints.add(biggerOrEqualThan(toGantt(orderInitDate)));
}
return Collections.emptyList();
break;
case START_IN_FIXED_DATE:
return Collections
.singletonList(equalTo(toGantt(startConstraint
.getConstraintDate())));
constraints.add(equalTo(toGantt(startConstraint
.getConstraintDate())));
break;
case START_NOT_EARLIER_THAN:
return Collections
.singletonList(biggerOrEqualThan(toGantt(startConstraint
.getConstraintDate())));
constraints.add(biggerOrEqualThan(toGantt(startConstraint
.getConstraintDate())));
break;
}
}
return Collections.emptyList();
if (!taskElement.isRoot() && taskElement instanceof TaskGroup) {
for (TaskElement child : ((TaskGroup) taskElement).getChildren()) {
constraints
.addAll(getStartConstraintsFor(child, orderInitDate));
}
}
return constraints;
}
public static List<Constraint<GanttDate>> getEndConstraintsFor(
TaskElement taskElement, LocalDate deadline) {
List<Constraint<GanttDate>> constraints = new ArrayList<Constraint<GanttDate>>();
if (taskElement instanceof ITaskPositionConstrained) {
ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement;
TaskPositionConstraint endConstraint = task.getPositionConstraint();
@ -155,15 +162,21 @@ public class TaskElementAdapter {
switch (type) {
case AS_LATE_AS_POSSIBLE:
if (deadline != null) {
return Collections
.singletonList(lessOrEqualThan(toGantt(deadline)));
constraints.add(lessOrEqualThan(toGantt(deadline)));
}
break;
case FINISH_NOT_LATER_THAN:
GanttDate date = toGantt(endConstraint.getConstraintDate());
return Collections.singletonList(lessOrEqualThan(date));
constraints.add(lessOrEqualThan(date));
break;
}
}
return Collections.emptyList();
if (!taskElement.isRoot() && taskElement instanceof TaskGroup) {
for (TaskElement child : ((TaskGroup) taskElement).getChildren()) {
constraints.addAll(getEndConstraintsFor(child, deadline));
}
}
return constraints;
}
public static GanttDate toGantt(IntraDayDate date) {