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

[Bug #903] Fix regression: creating a gap out of a LocalDate caused tasks may overlap due to loose of information about hour

Browse source 
FEA: ItEr71S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-03-02 20:00:18 +01:00
parent 0d3dff4ceb
commit 67f5eb2fc5
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
View file

@ -40,7 +40,10 @@ import org.navalplanner.business.workingday.IntraDayDate;
public class DateAndHour implements Comparable<DateAndHour> {
public static DateAndHour from(LocalDate date) {
return new DateAndHour(date, 0);
if (date != null) {
return new DateAndHour(date, 0);
}
return null;
}
public static DateAndHour from(IntraDayDate date) {

28
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/GapInterval.java
View file

@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.CalendarAvailability;
import org.navalplanner.business.resources.entities.Resource;
@ -78,33 +77,20 @@ public class GapInterval {
}
private GapInterval delimitByInterval(CalendarAvailability interval) {
LocalDate start = this.start != null ? this.start.getDate() : null;
LocalDate end = this.end != null ? this.end.getDate() : null;
DateAndHour intervalStart = DateAndHour.from(interval.getStartDate());
DateAndHour intervalEnd = DateAndHour.from(interval.getEndDate());
LocalDate newStart = max(start, interval.getStartDate());
LocalDate newEnd = min(end, interval.getEndDate());
DateAndHour newStart = (start == null || intervalStart == null) ? null
: DateAndHour.max(start, intervalStart);
DateAndHour newEnd = (end == null || intervalEnd == null) ? null
: DateAndHour.min(end, intervalStart);
if ((newStart == null && newEnd == null)
|| (newEnd != null && newStart.isAfter(newEnd))) {
// The period of time is not valid, as it's not an activated period
// of time according to calendar
return null;
}
return GapInterval.create(newStart != null ? DateAndHour.from(newStart)
: null, newEnd != null ? DateAndHour.from(newEnd) : null);
}
private LocalDate max(LocalDate date1, LocalDate date2) {
if (date1 == null || date2 == null) {
return null;
}
return date1.isAfter(date2) ? date1 : date2;
}
private LocalDate min(LocalDate date1, LocalDate date2) {
if (date1 == null || date2 == null) {
return null;
}
return date1.isBefore(date2) || date1.isEqual(date2) ? date1 : date2;
return GapInterval.create(newStart, newEnd);
}
public Gap gapOn(Resource resource) {