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

ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11: When activating recommended allocation previous allocations are removed

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-02 18:51:59 +01:00
parent 543c75b2c8
commit f011594686
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
View file

@ -96,7 +96,7 @@ public class AllocationRowsHandler {
}
public List<AllocationRow> getCurrentRows() {
return new ArrayList<AllocationRow>(currentRows);
return currentRows;
}
private boolean alreadyExistsAllocationFor(Resource resource) {
@ -240,4 +240,13 @@ public class AllocationRowsHandler {
return date.toDateTimeAtStartOfDay().toDate();
}
public void removeAll() {
for (AllocationRow each : copyOfCurrentRowsToAvoidConcurrentModification()) {
remove(each);
}
}
private ArrayList<AllocationRow> copyOfCurrentRowsToAvoidConcurrentModification() {
return new ArrayList<AllocationRow>(currentRows);
}
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
View file

@ -39,6 +39,7 @@ import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.planner.allocation.IResourceAllocationModel.IResourceAllocationContext;
import org.navalplanner.web.resourceload.ResourceLoadModel;
import org.zkoss.util.Locales;
@ -380,6 +381,8 @@ class FormBinder {
}
private void activatingRecommendedAllocation() {
allocationRowsHandler.removeAll();
Util.reloadBindings(allocationsList);
}
private void deactivatingRecommendedAllocation() {