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

Rename sumDurationsForDay to sumAvailabilitiesForDay to reflect better meaning

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-02 20:29:52 +02:00
parent 7e3fcaf8e5
commit ddf0dbd85c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
View file

@ -153,16 +153,17 @@ public abstract class ChartFiller implements IChartFiller {
return sum;
}
protected static EffortDuration sumDurationsForDay(
protected static EffortDuration sumAvailabilitiesForDay(
Collection<? extends Resource> resources, LocalDate day) {
EffortDuration sum = zero();
for (Resource resource : resources) {
sum = sum.plus(durationFor(resource, day));
sum = sum.plus(availabilityFor(resource, day));
}
return sum;
}
private static EffortDuration durationFor(Resource resource, LocalDate day) {
private static EffortDuration availabilityFor(Resource resource,
LocalDate day) {
return resource.getCalendarOrDefault().getCapacityDurationAt(day);
}

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

@ -953,7 +953,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
Entry<LocalDate, List<Resource>> element) {
LocalDate day = element.getKey();
List<Resource> resources = element.getValue();
return sumDurationsForDay(resources, day);
return sumAvailabilitiesForDay(resources, day);
}
}.calculate(getResourcesByDateBetween(resources, start, finish));