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

ItEr58S18CUEscaladoPantallaCargaRecursosEmpresaItEr57S10: Apply name filter to criteria

Browse source
This commit is contained in:
Jacobo Aragunde Pérez 2010-05-19 21:01:12 +02:00 • committed by Javier Moran Rua
parent a13d8ce6b5
commit 1a1ca760e9
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -224,6 +224,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
return resourceAllocationDAO
.findGenericAllocationsBySomeCriterion(criteriaToShowList, initDateFilter, endDateFilter);
}
Map<Criterion, List<GenericResourceAllocation>> toReturn;
if (filter()) {
allCriteriaList = new ArrayList<Criterion>();
List<GenericResourceAllocation> generics = new ArrayList<GenericResourceAllocation>();
@ -238,14 +239,26 @@ public class ResourceLoadModel implements IResourceLoadModel {
}
}
allCriteriaList = Criterion.sortByTypeAndName(allCriteriaList);
return resourceAllocationDAO
toReturn = resourceAllocationDAO
.findGenericAllocationsBySomeCriterion(allCriteriaList, initDateFilter, endDateFilter);
} else {
Map<Criterion, List<GenericResourceAllocation>> toReturn =
toReturn =
resourceAllocationDAO.findGenericAllocationsByCriterion(initDateFilter, endDateFilter);
allCriteriaList = Criterion.sortByTypeAndName(toReturn.keySet());
}
if(pageFilterPosition == -1) {
return toReturn;
}
//return only the elements in the page filter
Map<Criterion, List<GenericResourceAllocation>> toReturnFiltered =
new HashMap<Criterion, List<GenericResourceAllocation>>();
for(int i = pageFilterPosition; i < getEndPositionForCriterionPageFilter(); i++) {
Criterion criterion = allCriteriaList.get(i);
if(toReturn.get(criterion) != null) {
toReturnFiltered.put(criterion, toReturn.get(criterion));
}
}
return toReturnFiltered;
}
private List<Resource> resourcesToShow() {
@ -293,6 +306,13 @@ public class ResourceLoadModel implements IResourceLoadModel {
return pageSize;
}
private int getEndPositionForCriterionPageFilter() {
return
(pageFilterPosition + pageSize < allCriteriaList.size())?
pageFilterPosition + pageSize :
allCriteriaList.size();
}
private boolean filter() {
return filterBy != null;
}
@ -328,7 +348,15 @@ public class ResourceLoadModel implements IResourceLoadModel {
private List<LoadTimeLine> groupsFor(
Map<Criterion, List<GenericResourceAllocation>> genericAllocationsByCriterion) {
List<LoadTimeLine> result = new ArrayList<LoadTimeLine>();
for (Criterion criterion : allCriteriaList) {
List<Criterion> criteriaList;
if(pageFilterPosition == -1) {
criteriaList = allCriteriaList;
}
else {
criteriaList = allCriteriaList.subList(
pageFilterPosition, getEndPositionForCriterionPageFilter());
}
for(Criterion criterion : criteriaList) {
List<GenericResourceAllocation> allocations = ResourceAllocation
.sortedByStartDate(genericAllocationsByCriterion
.get(criterion));