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

ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: When removing a queueElement from a queue it is detached

Browse source
This commit is contained in:
Óscar González Fernández 2010-06-05 18:42:54 +02:00
parent f410e7bb72
commit d345ba0a00
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
View file

@ -235,4 +235,13 @@ public class LimitingResourceQueueElement extends BaseEntity {
}
return one.compareTo(another) >= 0 ? one : another;
}
public void detach() {
setLimitingResourceQueue(null);
setStartDate(null);
setStartHour(0);
setEndDate(null);
setEndHour(0);
getResourceAllocation().removeLimitingDayAssignments();
}
}

1
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
View file

@ -62,6 +62,7 @@ public class LimitingResourceQueue extends BaseEntity {
public void removeLimitingResourceQueueElement(LimitingResourceQueueElement element) {
limitingResourceQueueElements.remove(element);
element.detach();
}
public SortedSet<LimitingResourceQueueElement> getLimitingResourceQueueElements() {

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

@ -629,17 +629,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
LimitingResourceQueueElement queueElement = queuesState.getEquivalent(element);
LimitingResourceQueue queue = queuesState.getEquivalent(element
.getLimitingResourceQueue());
queue.removeLimitingResourceQueueElement(queueElement);
// Set as unassigned element
queueElement.setLimitingResourceQueue(null);
queueElement.setStartDate(null);
queueElement.setStartHour(0);
queueElement.setEndDate(null);
queueElement.setEndHour(0);
queueElement.getResourceAllocation().removeLimitingDayAssignments();
queuesState.addUnassigned(queueElement);
markAsModified(queueElement);
}