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

Remove deprecated uses of getCapacityAt

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-07 20:35:28 +02:00
parent 72c7e20581
commit dfc9ff9f06
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -20,6 +20,8 @@
package org.navalplanner.business.calendars.entities;
import static org.navalplanner.business.workingday.EffortDuration.zero;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -290,7 +292,7 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
* calendar restrictions.
*/
public Integer getWorkableHours(Date date) {
return getCapacityAt(new LocalDate(date));
return getWorkableTimeAt(new LocalDate(date)).roundToHours();
}
/**
@ -386,13 +388,21 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
* the calendar restrictions.
*/
public Integer getWorkableHours(LocalDate init, LocalDate end) {
int total = 0;
return getWorkableDuration(init, end).roundToHours();
}
/**
* Returns the workable duration for a specific period depending on the
* calendar restrictions.
*/
public EffortDuration getWorkableDuration(LocalDate init, LocalDate end) {
EffortDuration result = zero();
for (LocalDate current = init; current.compareTo(end) <= 0; current = current
.plusDays(1)) {
total += getCapacityAt(current);
result = result.plus(getCapacityDurationAt(current));
init = init.plusDays(1);
}
return total;
return result;
}
/**