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

Use IntraDayDates when merging an allocation into a Task

Browse source 
This way when merging the allocation the new greater precision allowed
by allocation algorithm is not lost.

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

16
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -366,21 +366,21 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
if (aggregate.isEmpty()) {
return;
}
final LocalDate start = aggregate.getStart();
final LocalDate end = aggregate.getEnd();
final IntraDayDate start = aggregate.getIntraDayStart();
final IntraDayDate end = aggregate.getIntraDayEnd();
mergeAllocation(scenario, start, end, calculatedValue, newAllocations,
modifications, toRemove);
}
private void mergeAllocation(Scenario scenario, final LocalDate start,
final LocalDate end,
private void mergeAllocation(Scenario scenario, final IntraDayDate start,
final IntraDayDate end,
CalculatedValue calculatedValue,
List<ResourceAllocation<?>> newAllocations,
List<ModifiedAllocation> modifications,
Collection<? extends ResourceAllocation<?>> toRemove) {
this.calculatedValue = calculatedValue;
setStartDate(start.toDateTimeAtStartOfDay().toDate());
setDaysDuration(Days.daysBetween(start, end).getDays());
setIntraDayStartDate(start);
setIntraDayEndDate(end);
for (ModifiedAllocation pair : modifications) {
Validate.isTrue(resourceAllocations.contains(pair.getOriginal()));
pair.getOriginal().mergeAssignmentsAndResourcesPerDay(scenario,
@ -514,8 +514,8 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
throw new RuntimeException("cant handle: " + calculatedValue);
}
updateDerived(copied);
mergeAllocation(onScenario, asLocalDate(getStartDate()),
asLocalDate(getEndDate()),
mergeAllocation(onScenario, getIntraDayStartDate(),
getIntraDayEndDate(),
calculatedValue, Collections
.<ResourceAllocation<?>> emptyList(), copied,
Collections.<ResourceAllocation<?>> emptyList());