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

[Bug #766] Fix bug

Browse source 
The problem lied in that the task's start date changed due to the task
being moved but the resource allocation keep on using its own date
instead of the new value. This leads to using a stale value for doing
the allocation. This can cause that the used start date was posterior
that the new end date as it happened in the exception.

FEA: ItEr66S04BugFixing
This commit is contained in:
Óscar González Fernández 2010-12-20 22:40:37 +01:00
parent 07a30262bf
commit 2a2b8a3331
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -590,7 +590,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
@Override
public IAllocateResourcesPerDay resourcesPerDayUntil(final LocalDate endExclusive) {
IntraDayDate startInclusive = getStartAfterConsolidated();
IntraDayDate startInclusive = getStartSpecifiedByTask();
IntraDayDate end = IntraDayDate.startOfDay(endExclusive);
return new AllocateResourcesPerDayOnInterval(startInclusive, end);
}
@ -598,9 +598,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
@Override
public IAllocateResourcesPerDay resourcesPerDayFromEndUntil(
LocalDate start) {
IntraDayDate startInclusive = IntraDayDate
.max(IntraDayDate.startOfDay(start),
getStartAfterConsolidated());
IntraDayDate startInclusive = IntraDayDate.max(
IntraDayDate.startOfDay(start), getStartSpecifiedByTask());
IntraDayDate endDate = task.getIntraDayEndDate();
return new AllocateResourcesPerDayOnInterval(startInclusive,
endDate);
@ -668,7 +667,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
@Override
public void allocateHours(int hours) {
allocate(getStartAfterConsolidated(),
allocate(getStartSpecifiedByTask(),
IntraDayDate.startOfDay(end), hours(hours));
}
};
@ -688,7 +687,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
private void allocate(IntraDayDate startInclusive,
IntraDayDate endExclusive, EffortDuration durationToAssign) {
IntraDayDate afterConsolidated = getStartAfterConsolidated();
IntraDayDate afterConsolidated = getStartSpecifiedByTask();
List<T> assignmentsCreated = createAssignments(
IntraDayDate.max(afterConsolidated, startInclusive),
endExclusive, durationToAssign);
@ -1426,8 +1425,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
return start != null ? start.getDate() : null;
}
public IntraDayDate getStartAfterConsolidated() {
IntraDayDate taskStart = getIntraDayStartDate();
private IntraDayDate getStartSpecifiedByTask() {
IntraDayDate taskStart = task.getIntraDayStartDate();
IntraDayDate firstDayNotConsolidated = getTask()
.getFirstDayNotConsolidated();
return IntraDayDate.max(taskStart, firstDayNotConsolidated);