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

ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #361] Fixed bug using hours from DayAssignments instead of OrderElements in order to calculate advance end date.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-03-02 17:31:39 +01:00 • committed by Javier Moran Rua
parent 90d61a0bb5
commit ffb9761a6f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
View file

@ -419,4 +419,14 @@ public abstract class TaskElement extends BaseEntity {
public abstract boolean isMilestone();
public Integer getTotalHoursAssigned() {
int result = 0;
for (ResourceAllocation<?> resourceAllocation : getSatisfiedResourceAllocations()) {
for (DayAssignment each : resourceAllocation.getAssignments()) {
result += each.getHours();
}
}
return result;
}
}

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

@ -266,7 +266,7 @@ public class TaskElementAdapter implements ITaskElementAdapter {
if (orderElement != null) {
advancePercentage = orderElement
.getAdvancePercentage();
hours = orderElement.getWorkHours();
hours = taskElement.getTotalHoursAssigned();
} else {
advancePercentage = new BigDecimal(0);
hours = Integer.valueOf(0);