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

Expose start and end dates of AggregateOfResourceAllocations as IntraDayDates

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-22 13:13:18 +02:00
parent 82cae5cff7
commit 8f978bb9c7
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java
View file

@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.lang.Validate;
import org.joda.time.Days;
import org.joda.time.LocalDate;
import org.navalplanner.business.workingday.IntraDayDate;
import org.navalplanner.business.workingday.ResourcesPerDay;
/**
@ -86,19 +87,29 @@ public class AggregateOfResourceAllocations {
}
public LocalDate getStart() {
if(isEmpty()){
IntraDayDate start = getIntraDayStart();
return start != null ? start.getDate() : null;
}
public IntraDayDate getIntraDayStart() {
if (isEmpty()) {
throw new IllegalStateException("the aggregate is empty");
}
return getAllocationsSortedByStartDate().get(0).getStartDate();
return getAllocationsSortedByStartDate().get(0).getIntraDayStartDate();
}
public LocalDate getEnd(){
if(isEmpty()){
IntraDayDate end = getIntraDayEnd();
return end != null ? end.getDate() : null;
}
public IntraDayDate getIntraDayEnd() {
if (isEmpty()) {
throw new IllegalStateException("the aggregate is empty");
}
LocalDate result = null;
IntraDayDate result = null;
for (ResourceAllocation<?> allocation : resourceAllocations) {
result = bigger(allocation.getEndDate(), result);
result = bigger(allocation.getIntraDayEndDate(), result);
}
return result;
}
@ -107,7 +118,7 @@ public class AggregateOfResourceAllocations {
return Days.daysBetween(getStart(), getEnd()).getDays();
}
private LocalDate bigger(LocalDate one, LocalDate other) {
private IntraDayDate bigger(IntraDayDate one, IntraDayDate other) {
if (one == null) {
return other;
}