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

Bug #1409: Fix problem replacing allocations for the ones related to the criterion

Browse source 
Without this patch, the replacement was been doing wrong as it has been
replacing the allocation related to a criterion with allocations related to any
of the criteria being shown.

This didn't happen in company view because of there's not unsaved changes, so
the replacement method do nothing.

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-04-17 13:17:24 +02:00
parent bd0406aa7b
commit ddf79bde1f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
View file

@ -26,6 +26,7 @@ import static org.libreplan.web.I18nHelper._;
import static org.libreplan.web.planner.order.PlanningStateCreator.and;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@ -461,8 +462,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
relatedWith,
asDate(parameters.getInitDateFilter()),
asDate(parameters.getEndDateFilter()));
return doReplacementsIfNeeded(result,
and(onInterval(), new RelatedWithAnyOf(relatedWith)));
return doReplacementsIfNeeded(result);
}
private Map<Criterion, List<ResourceAllocation<?>>> withAssociatedSpecific(
@ -494,19 +494,19 @@ public class ResourceLoadModel implements IResourceLoadModel {
resourceAllocationDAO.findGenericAllocationsByCriterion(
getCurrentScenario(),
asDate(parameters.getInitDateFilter()),
asDate(parameters.getEndDateFilter())),
onInterval());
asDate(parameters.getEndDateFilter())));
}
private Map<Criterion, List<GenericResourceAllocation>> doReplacementsIfNeeded(
Map<Criterion, List<GenericResourceAllocation>> map,
IAllocationCriteria criteria) {
Map<Criterion, List<GenericResourceAllocation>> map) {
if (!parameters.thereIsCurrentOrder()) {
return map;
}
Map<Criterion, List<GenericResourceAllocation>> result = new HashMap<Criterion, List<GenericResourceAllocation>>();
for (Entry<Criterion, List<GenericResourceAllocation>> each : map
.entrySet()) {
IAllocationCriteria criteria = and(onInterval(),
new RelatedWithAnyOf(Arrays.asList(each.getKey())));
List<ResourceAllocation<?>> replaced = parameters
.getPlanningState().replaceByCurrentOnes(
each.getValue(), criteria);