ItEr43S10SoporteImpresionMultiplesPaxinasItEr42S15: Converting to at least minimum before rounding

This commit is contained in:
Óscar González Fernández 2010-01-18 13:56:47 +01:00
parent ecba2626ef
commit 104a5d8ad1

View file

@ -92,14 +92,17 @@ public abstract class TimeTrackerStateUsingJodaTime extends TimeTrackerState {
@Override
public Interval getRealIntervalFor(Interval testInterval) {
LocalDate start = round(asLocalDate(testInterval.getStart()), true);
LocalDate finish = roundToNextYear(asLocalDate(testInterval.getFinish()));
return calculateForAtLeastMinimum(calculateIntervalWithMinimum(testInterval));
}
Interval candidateInterval = new Interval(start.toDateTimeAtStartOfDay().toDate(), finish
private Interval calculateForAtLeastMinimum(Interval atLeastMinimum) {
LocalDate start = round(asLocalDate(atLeastMinimum.getStart()), true);
LocalDate finish = roundToNextYear(asLocalDate(atLeastMinimum
.getFinish()));
Interval result = new Interval(start.toDateTimeAtStartOfDay().toDate(),
finish
.toDateTimeAtStartOfDay().toDate());
Interval resultInterval = calculateIntervalWithMinimum(candidateInterval);
return resultInterval;
return result;
}
protected LocalDate roundToNextYear(LocalDate date) {