diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 8c7a2fd7f..5134612c8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -250,14 +250,14 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { * calendar restrictions. */ public Integer getWorkableHours(Date date) { - return getWorkableHours(new LocalDate(date)); + return getCapacityAt(new LocalDate(date)); } /** * Returns the number of workable hours for a specific date depending on the * calendar restrictions. */ - public Integer getWorkableHours(LocalDate date) { + public Integer getCapacityAt(LocalDate date) { CalendarException exceptionDay = getExceptionDay(date); if (exceptionDay != null) { return exceptionDay.getHours(); @@ -329,7 +329,7 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { int total = 0; for (LocalDate current = init; current.compareTo(end) <= 0; current = current .plusDays(1)) { - total += getWorkableHours(current); + total += getCapacityAt(current); init = init.plusDays(1); } return total; @@ -442,7 +442,7 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { return DayType.ANCESTOR_EXCEPTION; } - if (getWorkableHours(date) == 0) { + if (getCapacityAt(date) == 0) { return DayType.ZERO_HOURS; } @@ -640,7 +640,7 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { Set result = new HashSet(); for (LocalDate current = init; current.compareTo(end) <= 0; current = current .plusDays(1)) { - if (getWorkableHours(current) == 0) { + if (getCapacityAt(current) == 0) { result.add(current); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java index f87a0cd6e..4a5843bb9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java @@ -43,18 +43,18 @@ public abstract class CombinedWorkHours implements IWorkHours { } @Override - public Integer getWorkableHours(LocalDate date) { + public Integer getCapacityAt(LocalDate date) { Integer current = null; for (IWorkHours workHour : workHours) { - current = current == null ? workHours(workHour, date) - : updateWorkHours(current, workHour, date); + current = current == null ? capacity(workHour, date) + : updateCapacity(current, workHour, date); } return current; } - protected abstract Integer workHours(IWorkHours workHour, LocalDate date); + protected abstract Integer capacity(IWorkHours workHour, LocalDate date); - protected abstract Integer updateWorkHours(Integer current, + protected abstract Integer updateCapacity(Integer current, IWorkHours workHour, LocalDate date); } @@ -66,13 +66,13 @@ class Min extends CombinedWorkHours { } @Override - protected Integer updateWorkHours(Integer current, IWorkHours workHour, + protected Integer updateCapacity(Integer current, IWorkHours workHour, LocalDate date) { - return Math.min(current, workHour.getWorkableHours(date)); + return Math.min(current, workHour.getCapacityAt(date)); } @Override - protected Integer workHours(IWorkHours workHour, LocalDate date) { - return workHour.getWorkableHours(date); + protected Integer capacity(IWorkHours workHour, LocalDate date) { + return workHour.getCapacityAt(date); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java index 9b4fb85fa..9384fc033 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java @@ -24,6 +24,13 @@ import org.joda.time.LocalDate; public interface IWorkHours { - public Integer getWorkableHours(LocalDate date); + /** + * Calculates the capacity at a given date. It means all the hours that + * could be worked without having overtime + * @param date + * the date at which the capacity is calculated + * @return the capacity at which the resource can work + */ + public Integer getCapacityAt(LocalDate date); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java index 828321666..abd74eded 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java @@ -59,11 +59,11 @@ public class ResourceCalendar extends BaseCalendar { } @Override - public Integer getWorkableHours(LocalDate date) { + public Integer getCapacityAt(LocalDate date) { if (!isActive(date)) { return 0; } - return multiplyByCapacity(super.getWorkableHours(date)); + return multiplyByCapacity(super.getCapacityAt(date)); } private Integer multiplyByCapacity(Integer workableHours) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java index 541bb34bc..2fa5269dd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java @@ -40,7 +40,7 @@ public class SameWorkHoursEveryDay implements IWorkHours { } @Override - public Integer getWorkableHours(LocalDate date) { + public Integer getCapacityAt(LocalDate date) { return hours; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java index 30e9cf072..f5f7cf147 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java @@ -84,7 +84,7 @@ public class HoursDistributor { Resource resource = resources.get(i); IWorkHours workHoursForResource = workHours.get(i); int alreadyAssignedHours = resource.getAssignedHours(day); - Integer workableHours = workHoursForResource.getWorkableHours(day); + Integer workableHours = workHoursForResource.getCapacityAt(day); // a resource would have a zero share if all it's hours for a // given day are filled shares.add(new Share(alreadyAssignedHours - workableHours)); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index cd0c84251..0d6179571 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -425,7 +425,7 @@ public abstract class ResourceAllocation extends List shares = new ArrayList(); for (LocalDate day : days) { shares.add(new Share(-getWorkHoursPerDay() - .getWorkableHours(day))); + .getCapacityAt(day))); } ShareDivision original = ShareDivision.create(shares); ShareDivision newShare = original.plus(hoursToSum); @@ -450,7 +450,7 @@ public abstract class ResourceAllocation extends final int calculateTotalToDistribute(LocalDate day, ResourcesPerDay resourcesPerDay) { - Integer workableHours = getWorkHoursPerDay().getWorkableHours(day); + Integer workableHours = getWorkHoursPerDay().getCapacityAt(day); return resourcesPerDay.asHoursGivenResourceWorkingDayOf(workableHours); } @@ -460,7 +460,7 @@ public abstract class ResourceAllocation extends int sumTotalHours = 0; int sumWorkableHours = 0; for (Entry> entry : byDay.entrySet()) { - sumWorkableHours += getWorkHoursPerDay().getWorkableHours( + sumWorkableHours += getWorkHoursPerDay().getCapacityAt( entry.getKey()); sumTotalHours += getAssignedHours(entry.getValue()); } @@ -478,12 +478,12 @@ public abstract class ResourceAllocation extends private IWorkHours getTaskWorkHoursLimit() { return new IWorkHours() { @Override - public Integer getWorkableHours(LocalDate day) { + public Integer getCapacityAt(LocalDate day) { if (getTaskCalendar() == null) { return SameWorkHoursEveryDay.getDefaultWorkingDay() - .getWorkableHours(day); + .getCapacityAt(day); } else { - return getTaskCalendar().getWorkableHours(day); + return getTaskCalendar().getCapacityAt(day); } } }; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index 0a6b41c0b..a94eb1cbc 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -692,7 +692,7 @@ public abstract class Resource extends BaseEntity{ final int days = Days.daysBetween(start, end).getDays(); for (int i = 0; i < days; i++) { LocalDate current = start.plusDays(i); - Integer workableHours = calendar.getWorkableHours(current); + Integer workableHours = calendar.getCapacityAt(current); if (workableHours != null) { sum += workableHours; } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java index 891ddb06f..46fe9f310 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java @@ -116,10 +116,10 @@ public class BaseCalendarTest { public void testGetWorkableHoursBasic() { BaseCalendar calendar = createBasicCalendar(); - int wednesdayHours = calendar.getWorkableHours(WEDNESDAY_LOCAL_DATE); + int wednesdayHours = calendar.getCapacityAt(WEDNESDAY_LOCAL_DATE); assertThat(wednesdayHours, equalTo(8)); - int sundayHours = calendar.getWorkableHours(SUNDAY_LOCAL_DATE); + int sundayHours = calendar.getCapacityAt(SUNDAY_LOCAL_DATE); assertThat(sundayHours, equalTo(0)); } @@ -127,7 +127,7 @@ public class BaseCalendarTest { public void testGetWorkableHoursChristmas() { BaseCalendar calendar = createChristmasCalendar(); - int hours = calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE); + int hours = calendar.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE); assertThat(hours, equalTo(0)); } @@ -143,10 +143,10 @@ public class BaseCalendarTest { public void testGetWorkableHoursDerivedBasicCalendar() { BaseCalendar calendar = createBasicCalendar().newDerivedCalendar(); - int wednesdayHours = calendar.getWorkableHours(WEDNESDAY_LOCAL_DATE); + int wednesdayHours = calendar.getCapacityAt(WEDNESDAY_LOCAL_DATE); assertThat(wednesdayHours, equalTo(8)); - int sundayHours = calendar.getWorkableHours(SUNDAY_LOCAL_DATE); + int sundayHours = calendar.getCapacityAt(SUNDAY_LOCAL_DATE); assertThat(sundayHours, equalTo(0)); } @@ -154,7 +154,7 @@ public class BaseCalendarTest { public void testGetWorkableHoursDerivedChristmasCalendar() { BaseCalendar calendar = createChristmasCalendar().newDerivedCalendar(); - int hours = calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE); + int hours = calendar.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE); assertThat(hours, equalTo(0)); } @@ -166,13 +166,13 @@ public class BaseCalendarTest { 4, createCalendarExceptionType()); calendar.addExceptionDay(day); - int mondayHours = calendar.getWorkableHours(MONDAY_LOCAL_DATE); + int mondayHours = calendar.getCapacityAt(MONDAY_LOCAL_DATE); assertThat(mondayHours, equalTo(8)); - int wednesdayHours = calendar.getWorkableHours(WEDNESDAY_LOCAL_DATE); + int wednesdayHours = calendar.getCapacityAt(WEDNESDAY_LOCAL_DATE); assertThat(wednesdayHours, equalTo(4)); - int sundayHours = calendar.getWorkableHours(SUNDAY_LOCAL_DATE); + int sundayHours = calendar.getCapacityAt(SUNDAY_LOCAL_DATE); assertThat(sundayHours, equalTo(0)); } @@ -184,7 +184,7 @@ public class BaseCalendarTest { CHRISTMAS_DAY_LOCAL_DATE, 4, createCalendarExceptionType()); calendar.addExceptionDay(day); - int hours = calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE); + int hours = calendar.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE); assertThat(hours, equalTo(4)); } @@ -262,15 +262,15 @@ public class BaseCalendarTest { calendar.setHours(Days.WEDNESDAY, 4); calendar.setHours(Days.SUNDAY, 4); - assertThat(calendar.getWorkableHours(WEDNESDAY_LOCAL_DATE), equalTo(4)); + assertThat(calendar.getCapacityAt(WEDNESDAY_LOCAL_DATE), equalTo(4)); assertThat(calendar - .getWorkableHours(WEDNESDAY_LOCAL_DATE.minusWeeks(1)), + .getCapacityAt(WEDNESDAY_LOCAL_DATE.minusWeeks(1)), equalTo(8)); - assertThat(calendar.getWorkableHours(SUNDAY_LOCAL_DATE), equalTo(4)); + assertThat(calendar.getCapacityAt(SUNDAY_LOCAL_DATE), equalTo(4)); - assertThat(calendar.getWorkableHours(SUNDAY_LOCAL_DATE.minusWeeks(1)), + assertThat(calendar.getCapacityAt(SUNDAY_LOCAL_DATE.minusWeeks(1)), equalTo(0)); } @@ -282,14 +282,14 @@ public class BaseCalendarTest { calendar.setHours(Days.MONDAY, 1); calendar.setHours(Days.SUNDAY, 2); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE), equalTo(1)); + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(1)); - assertThat(calendar.getWorkableHours(SUNDAY_LOCAL_DATE), equalTo(2)); + assertThat(calendar.getCapacityAt(SUNDAY_LOCAL_DATE), equalTo(2)); assertThat(calendar - .getWorkableHours(MONDAY_LOCAL_DATE.minusWeeks(1)), equalTo(8)); + .getCapacityAt(MONDAY_LOCAL_DATE.minusWeeks(1)), equalTo(8)); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE .minusDays(1)), equalTo(0)); } @@ -334,10 +334,10 @@ public class BaseCalendarTest { createCalendarExceptionType()); assertThat(calendar - .getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE.plusYears(1)), equalTo(8)); + .getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE.plusYears(1)), equalTo(8)); assertThat(calendar - .getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); + .getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); } public static void setHoursForAllDays(BaseCalendar calendar, Integer hours) { @@ -361,11 +361,11 @@ public class BaseCalendarTest { calendar.newVersion(FRIDAY_LOCAL_DATE); setHoursForAllDays(calendar, 2); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE), equalTo(8)); + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(8)); - assertThat(calendar.getWorkableHours(WEDNESDAY_LOCAL_DATE), equalTo(4)); + assertThat(calendar.getCapacityAt(WEDNESDAY_LOCAL_DATE), equalTo(4)); - assertThat(calendar.getWorkableHours(FRIDAY_LOCAL_DATE), equalTo(2)); + assertThat(calendar.getCapacityAt(FRIDAY_LOCAL_DATE), equalTo(2)); } @@ -379,15 +379,15 @@ public class BaseCalendarTest { calendar.newVersion(WEDNESDAY_LOCAL_DATE); setHoursForAllDays(calendar, 2); - assertThat(baseCalendar.getWorkableHours(MONDAY_LOCAL_DATE), equalTo(8)); + assertThat(baseCalendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(8)); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE), equalTo(4)); + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(4)); - assertThat(baseCalendar.getWorkableHours(FRIDAY_LOCAL_DATE), equalTo(8)); + assertThat(baseCalendar.getCapacityAt(FRIDAY_LOCAL_DATE), equalTo(8)); - assertThat(calendar.getWorkableHours(FRIDAY_LOCAL_DATE), equalTo(2)); + assertThat(calendar.getCapacityAt(FRIDAY_LOCAL_DATE), equalTo(2)); - assertThat(calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); } @@ -414,7 +414,7 @@ public class BaseCalendarTest { private void thenForAllDaysReturnsZero() { for (LocalDate localDate : DAYS_OF_A_WEEK_EXAMPLE) { - assertThat(calendarFixture.getWorkableHours(localDate), equalTo(0)); + assertThat(calendarFixture.getCapacityAt(localDate), equalTo(0)); } } @@ -513,7 +513,7 @@ public class BaseCalendarTest { calendar.setParent(parent); assertThat(calendar.getParent(), equalTo(parent)); - assertThat(calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); } @@ -523,7 +523,7 @@ public class BaseCalendarTest { BaseCalendar derived = calendar.newDerivedCalendar(); BaseCalendar copy = derived.newCopy(); - assertThat(copy.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); + assertThat(copy.getCapacityAt(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0)); assertThat(copy.getParent(), equalTo(calendar)); assertThat(copy.getCalendarDataVersions().size(), equalTo(1)); } @@ -551,10 +551,10 @@ public class BaseCalendarTest { assertThat(calendar.getParent(MONDAY_LOCAL_DATE), equalTo(parent1)); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(8)); - assertThat(calendar.getWorkableHours(FRIDAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(FRIDAY_LOCAL_DATE), equalTo(4)); } @@ -568,10 +568,10 @@ public class BaseCalendarTest { calendar.addExceptionDay(CalendarException.create(FRIDAY_LOCAL_DATE, 0, createCalendarExceptionType())); - assertThat(calendar.getWorkableHours(MONDAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(MONDAY_LOCAL_DATE), equalTo(0)); - assertThat(calendar.getWorkableHours(FRIDAY_LOCAL_DATE), + assertThat(calendar.getCapacityAt(FRIDAY_LOCAL_DATE), equalTo(0)); assertThat(calendar.getOwnExceptions().size(), equalTo(2)); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java index 15525023a..dacf0b28d 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java @@ -55,13 +55,13 @@ public class CombinedWorkHoursTest { public void returnsTheMinOfCalendars() { IWorkHours minOf = CombinedWorkHours .minOf(hours(4), hours(2), hours(7)); - Integer hours = minOf.getWorkableHours(new LocalDate(2000, 3, 3)); + Integer hours = minOf.getCapacityAt(new LocalDate(2000, 3, 3)); assertThat(hours, equalTo(2)); } private IWorkHours hours(int hours) { IWorkHours result = createNiceMock(IWorkHours.class); - expect(result.getWorkableHours(isA(LocalDate.class))).andReturn(hours); + expect(result.getCapacityAt(isA(LocalDate.class))).andReturn(hours); replay(result); return result; } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/ResourceCalendarTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/ResourceCalendarTest.java index 3c355da1c..b99ce956b 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/ResourceCalendarTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/ResourceCalendarTest.java @@ -72,8 +72,8 @@ public class ResourceCalendarTest { public void testGetWorkableHours() { ResourceCalendar calendar = createBasicResourceCalendar(); - assertThat(calendar.getWorkableHours(PAST), equalTo(0)); - assertThat(calendar.getWorkableHours(FUTURE), equalTo(8)); + assertThat(calendar.getCapacityAt(PAST), equalTo(0)); + assertThat(calendar.getCapacityAt(FUTURE), equalTo(8)); } @Test(expected = IllegalArgumentException.class) diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java index 94a2d7973..80fcc9830 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java @@ -153,7 +153,7 @@ public class GenericResourceAllocationTest { BaseCalendar baseCalendar = createNiceMock(BaseCalendar.class); expect(baseCalendar.getWorkableHours(isA(Date.class))).andReturn( hoursPerDay).anyTimes(); - expect(baseCalendar.getWorkableHours(isA(LocalDate.class))).andReturn( + expect(baseCalendar.getCapacityAt(isA(LocalDate.class))).andReturn( hoursPerDay).anyTimes(); replay(baseCalendar); this.baseCalendar = baseCalendar; @@ -319,7 +319,7 @@ public class GenericResourceAllocationTest { public void allocatingSeveralResourcesPerDayHavingJustOneResourceProducesOvertime() { LocalDate start = new LocalDate(2006, 10, 5); final Integer standardHoursPerDay = SameWorkHoursEveryDay - .getDefaultWorkingDay().getWorkableHours(start); + .getDefaultWorkingDay().getCapacityAt(start); final int TASK_DURATION_DAYS = 4; givenBaseCalendarWithoutExceptions(standardHoursPerDay); givenTaskWithStartAndEnd(toInterval(start, Period @@ -360,7 +360,7 @@ public class GenericResourceAllocationTest { LocalDate start = new LocalDate(2006, 10, 5); final int TASK_DURATION_DAYS = 1; final Integer defaultWorkableHours = SameWorkHoursEveryDay - .getDefaultWorkingDay().getWorkableHours(start); + .getDefaultWorkingDay().getCapacityAt(start); givenBaseCalendarWithoutExceptions(defaultWorkableHours); givenTaskWithStartAndEnd(toInterval(start, Period .days(TASK_DURATION_DAYS))); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java index 41f585ddb..c60f6ebfa 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java @@ -67,7 +67,7 @@ public class SpecificResourceAllocationTest { private void givenResourceCalendarAlwaysReturning(int hours) { this.calendar = createNiceMock(ResourceCalendar.class); - expect(this.calendar.getWorkableHours(isA(LocalDate.class))).andReturn( + expect(this.calendar.getCapacityAt(isA(LocalDate.class))).andReturn( hours).anyTimes(); expect(this.calendar.getWorkableHours(isA(Date.class))) .andReturn(hours).anyTimes(); @@ -76,7 +76,7 @@ public class SpecificResourceAllocationTest { private void givenResourceCalendar(final int defaultAnswer, final Map answersForDates){ this.calendar = createNiceMock(ResourceCalendar.class); - expect(this.calendar.getWorkableHours(isA(LocalDate.class))).andAnswer(new IAnswer() { + expect(this.calendar.getCapacityAt(isA(LocalDate.class))).andAnswer(new IAnswer() { @Override public Integer answer() throws Throwable { 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 e7e984bb8..4e176df88 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 @@ -123,10 +123,10 @@ public abstract class ChartFiller implements IChartFiller { int result = 0; ResourceCalendar calendar = resource.getCalendar(); if (calendar != null) { - result += calendar.getWorkableHours(day); + result += calendar.getCapacityAt(day); } else { result += SameWorkHoursEveryDay.getDefaultWorkingDay() - .getWorkableHours(day); + .getCapacityAt(day); } return result; } 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 9d1d1cae3..c9e66e683 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 @@ -625,9 +625,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { BaseCalendar calendar = resource.getCalendar(); int workableHours = SameWorkHoursEveryDay - .getDefaultWorkingDay().getWorkableHours(day); + .getDefaultWorkingDay().getCapacityAt(day); if (calendar != null) { - workableHours = calendar.getWorkableHours(day); + workableHours = calendar.getCapacityAt(day); } int assignedHours = dayAssignmentGrouped.get(day).get( @@ -657,9 +657,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { BaseCalendar calendar = resource.getCalendar(); int workableHours = SameWorkHoursEveryDay - .getDefaultWorkingDay().getWorkableHours(day); + .getDefaultWorkingDay().getCapacityAt(day); if (calendar != null) { - workableHours = calendar.getWorkableHours(day); + workableHours = calendar.getCapacityAt(day); } int assignedHours = dayAssignmentGrouped.get(day).get( diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 27bded0c2..9f638db39 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -853,9 +853,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { BaseCalendar calendar = resource.getCalendar(); int workableHours = SameWorkHoursEveryDay.getDefaultWorkingDay() - .getWorkableHours(day); + .getCapacityAt(day); if (calendar != null) { - workableHours = calendar.getWorkableHours(day); + workableHours = calendar.getCapacityAt(day); } return workableHours;