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

ItEr52S13CUCreacionRecursosLimitantes: Added isLimitedResource filter for machines list

Browse source
This commit is contained in:
Diego Pino Garcia 2010-04-05 02:18:16 +02:00 • committed by Javier Moran Rua
parent e94e74c7ac
commit 40a6c95407
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
View file

@ -99,6 +99,8 @@ public class MachineCRUDController extends GenericForwardComposer {
private Datebox filterFinishDate;
private Combobox filterLimitedResource;
private Textbox txtfilter;
private BandboxMultipleSearch bdFilters;
@ -141,6 +143,8 @@ public class MachineCRUDController extends GenericForwardComposer {
.getFellowIfAny("filterFinishDate");
this.filterStartDate = (Datebox) listWindow
.getFellowIfAny("filterStartDate");
this.filterLimitedResource = (Combobox) listWindow
.getFellowIfAny("filterLimitedResource");
this.bdFilters = (BandboxMultipleSearch) listWindow
.getFellowIfAny("bdFilters");
this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter");
@ -514,13 +518,18 @@ public class MachineCRUDController extends GenericForwardComposer {
.getValue());
}
final Comboitem item = filterLimitedResource.getSelectedItem();
Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
.valueOf((LimitedResourceEnum) item.getValue()) : null;
if (listFilters.isEmpty()
&& (personalFilter == null || personalFilter.isEmpty())
&& startDate == null && finishDate == null) {
&& startDate == null && finishDate == null
&& isLimitedResource == null) {
return null;
}
return new ResourcePredicate(listFilters, personalFilter, startDate,
finishDate);
finishDate, isLimitedResource);
}
private void filterByPredicate(ResourcePredicate predicate) {
@ -541,6 +550,10 @@ public class MachineCRUDController extends GenericForwardComposer {
listing.invalidate();
}
public Set<LimitedResourceEnum> getLimitedResourceFilterOptionList() {
return LimitedResourceEnum.getLimitedResourceFilterOptionList();
}
public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
return LimitedResourceEnum.getLimitedResourceOptionList();
}

12
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
View file

@ -58,19 +58,13 @@ public class ResourcePredicate implements IPredicate {
public ResourcePredicate(List<FilterPair> filters, String personalFilters,
LocalDate startDate,
LocalDate finishDate) {
LocalDate finishDate,
Boolean isLimitedResource) {
this.filters = filters;
this.startDate = startDate;
this.finishDate = finishDate;
this.personalFilters = personalFilters.split(" ");
}
public ResourcePredicate(List<FilterPair> filters, String personalFilters,
LocalDate startDate,
LocalDate finishDate,
Boolean isLimitedResource) {
this(filters, personalFilters, startDate, finishDate);
this.isLimitedResource = isLimitedResource;
this.personalFilters = personalFilters.split(" ");
}
@Override