From ddf0dbd85c905c237efad3bb9ee45d493fb2a4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 2 Sep 2010 20:29:52 +0200 Subject: [PATCH] Rename sumDurationsForDay to sumAvailabilitiesForDay to reflect better meaning FEA: ItEr60S19TimeUnitDataType --- .../org/navalplanner/web/planner/chart/ChartFiller.java | 7 ++++--- .../web/planner/company/CompanyPlanningModel.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java index 6b2dcd445..8633b0eae 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java @@ -153,16 +153,17 @@ public abstract class ChartFiller implements IChartFiller { return sum; } - protected static EffortDuration sumDurationsForDay( + protected static EffortDuration sumAvailabilitiesForDay( Collection 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); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index af8a5b820..daee88f66 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -953,7 +953,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { Entry> element) { LocalDate day = element.getKey(); List resources = element.getValue(); - return sumDurationsForDay(resources, day); + return sumAvailabilitiesForDay(resources, day); } }.calculate(getResourcesByDateBetween(resources, start, finish));