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

Rename to less confusing name

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-03 18:22:05 +02:00
parent ed44373b2c
commit 5472ba7ac4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -1250,7 +1250,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
for (Resource resource : orderDayAssignmentsGrouped.get(day)
.keySet()) {
final EffortDuration resourceCapacityHours = availabilityFor(
final EffortDuration resourceCapacityHours = calendarCapacityFor(
resource, day);
final EffortDuration durationAtOrder = orderDayAssignmentsGrouped
@ -1303,7 +1303,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
EffortDuration result = zero();
for (Resource resource : orderDayAssignmentsGrouped.get(day)
.keySet()) {
result = result.plus(availabilityFor(resource, day));
result = result.plus(calendarCapacityFor(resource, day));
}
return result;
}