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

ItEr58S10CUAsignacionRecursosLimitantesItEr57S11: Fix bug move queue element position inside queue or between queues

Browse source
This commit is contained in:
Diego Pino Garcia 2010-05-27 19:04:51 +02:00 • committed by Javier Moran Rua
parent 10a1b8d592
commit 7d299efc28
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -755,15 +755,22 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
Validate.notNull(queue);
Validate.notNull(startTime);
removeDaysAssignmentsIfAny(beingEdited);
LimitingResourceQueue currentQueue = beingEdited.getLimitingResourceQueue();
if (currentQueue != null) {
removeDayAssignments(beingEdited);
removeFromQueue(currentQueue, beingEdited);
}
return assignLimitingResourceQueueElementToQueueAt(beingEdited, queue, startTime);
}
public void removeDaysAssignmentsIfAny(LimitingResourceQueueElement element) {
private void removeDayAssignments(LimitingResourceQueueElement element) {
final ResourceAllocation<?> resourceAllocation = element.getResourceAllocation();
if (!resourceAllocation.getAssignments().isEmpty()) {
resourceAllocation.removeLimitingDayAssignments();
}
resourceAllocation.removeLimitingDayAssignments();
}
private void removeFromQueue(LimitingResourceQueue queue, LimitingResourceQueueElement element) {
queue.removeLimitingResourceQueueElement(element);
element.setLimitingResourceQueue(null);
}
@Override