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

Avoid unnecessary calculations

Browse source 
The interval is applied immediately.

FEA: ItEr75S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-09-15 17:09:39 +02:00
parent c23360b063
commit ea99dc9a46
2 changed files with 11 additions and 5 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/chart/ResourceLoadChartData.java
View file

@ -62,10 +62,18 @@ public class ResourceLoadChartData implements ILoadChartData {
private SortedMap<LocalDate, EffortDuration> availability;
public ResourceLoadChartData(List<DayAssignment> dayAssignments, List<Resource> resources) {
this(dayAssignments, resources, null, null);
}
public ResourceLoadChartData(List<DayAssignment> dayAssignments,
List<Resource> resources, LocalDate startInclusive,
LocalDate endExclusive) {
ContiguousDaysLine<List<DayAssignment>> assignments = ContiguousDaysLine
.byDay(dayAssignments);
if (startInclusive != null && endExclusive != null) {
assignments = assignments.subInterval(startInclusive, endExclusive);
}
ContiguousDaysLine<EffortDuration> load = assignments
.transform(extractLoad());

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -900,10 +900,8 @@ public class ResourceLoadController implements Composer {
List<DayAssignment> assignments = generatedData
.getDayAssignmentsConsidered();
List<Resource> resources = generatedData.getResourcesConsidered();
ResourceLoadChartData data = new ResourceLoadChartData(assignments,
resources);
return data.on(getStart(generatedData.getFilterStart(), interval),
getEnd(generatedData.getFilterEnd(), interval));
return new ResourceLoadChartData(assignments,
resources, interval.getStart(), interval.getFinish());
}
}