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

Fix problem with consolidation and specific assignments

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-12-20 18:00:14 +01:00
parent 85ce192e06
commit 97e2c721d7
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
View file

@ -41,7 +41,6 @@ import org.libreplan.business.planner.daos.ITaskElementDAO;
import org.libreplan.business.planner.entities.ResourceAllocation;
import org.libreplan.business.planner.entities.ResourceAllocation.AllocationsSpecified;
import org.libreplan.business.planner.entities.ResourceAllocation.DetachDayAssignmentOnRemoval;
import org.libreplan.business.planner.entities.SpecificResourceAllocation;
import org.libreplan.business.planner.entities.Task;
import org.libreplan.business.planner.entities.TaskElement;
import org.libreplan.business.planner.entities.consolidations.CalculatedConsolidatedValue;
@ -250,15 +249,8 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
private void reassign(ResourceAllocation<?> resourceAllocation,
IntraDayDate end, EffortDuration pendingEffort) {
if (resourceAllocation instanceof SpecificResourceAllocation) {
((SpecificResourceAllocation) resourceAllocation)
.allocateWholeAllocationKeepingProportions(pendingEffort,
end);
} else {
resourceAllocation.withPreviousAssociatedResources()
.fromStartUntil(end)
.allocate(pendingEffort);
}
resourceAllocation.withPreviousAssociatedResources()
.fromStartUntil(end).allocate(pendingEffort);
}
private void reassignExpandingTask(