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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #525] Always use percentage method to calculate advance date in TaskGroups.

Browse source
This commit is contained in:
Jacobo Aragunde Pérez 2010-07-07 13:11:18 +02:00 • committed by Javier Moran Rua
parent d76b5546ba
commit f487801ae4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,7 @@ import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.StartConstraintType;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.planner.entities.TaskStartConstraint;
import org.navalplanner.business.planner.entities.Dependency.Type;
import org.navalplanner.business.resources.daos.ICriterionDAO;
@ -304,10 +305,16 @@ public class TaskElementAdapter implements ITaskElementAdapter {
Integer advanceHours = advancePercentage.multiply(
new BigDecimal(hours)).intValue();
LocalDate date = calculateLimitDate(advanceHours);
if (date == null) {
LocalDate date;
if(taskElement instanceof TaskGroup) {
date = calculateLimitDate(advancePercentage);
}
else {
date = calculateLimitDate(advanceHours);
if (date == null) {
date = calculateLimitDate(advancePercentage);
}
}
return date.toDateTimeAtStartOfDay().toDate();
}