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

ItEr58S10CUAsignacionRecursosLimitantesItEr57S11: Fix bug attach day assignments to resource allocation after allocating queue element into queue

Browse source
This commit is contained in:
Diego Pino Garcia 2010-05-18 09:18:20 +02:00 • committed by Javier Moran Rua
parent ad2a593563
commit 27cfc6f786
2 changed files with 6 additions and 3 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/entities/ResourceAllocation.java
View file

@ -574,9 +574,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
allocateLimitingDayAssignments(Collections.<T>emptyList());
}
public void allocateLimitingDayAssignments(List<T> assignments) {
@SuppressWarnings("unchecked")
public void allocateLimitingDayAssignments(List<? extends DayAssignment> assignments) {
assert isLimiting();
resetAssignmentsTo(assignments);
resetAssignmentsTo((List<T>) assignments);
}
protected abstract void addingAssignments(

4
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -395,13 +395,15 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
startTime = earliestGap.getStartTime();
}
// Generate day assignments and adjust start and end times for element
// Allocate day assignments and adjust start and end times for element
List<DayAssignment> dayAssignments = LimitingResourceAllocator
.generateDayAssignments(queueElement.getResourceAllocation(),
queue.getResource(), startTime);
DateAndHour[] startAndEndTime = LimitingResourceAllocator
.calculateStartAndEndTime(dayAssignments);
updateStartAndEndTimes(queueElement, startAndEndTime);
queueElement.getResourceAllocation().allocateLimitingDayAssignments(
dayAssignments);
// Add element to queue
addLimitingResourceQueueElement(queue, queueElement);