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

Transform OrderFilterEnum parameters to TaskGroupFilterEnum for company view filter

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-05 19:15:19 +01:00
parent 9f703ae11f
commit 9736e4daf3
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
View file

@ -1493,10 +1493,42 @@ public class OrderCRUDController extends GenericForwardComposer {
Sessions.getCurrent().setAttribute("companyFilterFinishDate",
filterFinishDate.getValue());
Sessions.getCurrent().setAttribute("companyFilterLabel",
bdFilters.getSelectedElements());
getSelectedBandboxAsTaskGroupFilters());
Sessions.getCurrent().setAttribute("companyFilterChanged", true);
}
private List<FilterPair> getSelectedBandboxAsTaskGroupFilters() {
List<FilterPair> result = new ArrayList<FilterPair>();
for (FilterPair filterPair : (List<FilterPair>) bdFilters
.getSelectedElements()) {
OrderFilterEnum type = (OrderFilterEnum) filterPair
.getType();
switch (type) {
case Label:
result.add(new FilterPair(TaskGroupFilterEnum.Label, filterPair
.getPattern(), filterPair.getValue()));
break;
case Criterion:
result.add(new FilterPair(TaskGroupFilterEnum.Criterion,
filterPair.getPattern(), filterPair.getValue()));
break;
case ExternalCompany:
result.add(new FilterPair(TaskGroupFilterEnum.ExternalCompany,
filterPair.getPattern(), filterPair.getValue()));
break;
case State:
result.add(new FilterPair(TaskGroupFilterEnum.State, filterPair
.getPattern(), filterPair.getValue()));
break;
default:
result.add(new FilterPair(OrderFilterEnum.Label, filterPair
.getPattern(), filterPair.getValue()));
break;
}
}
return result;
}
private OrderPredicate createPredicate() {
List<FilterPair> listFilters = (List<FilterPair>) bdFilters
.getSelectedElements();

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
View file

@ -162,6 +162,7 @@ public class CompanyPlanningController implements Composer {
List<FilterPair> sessionFilterPairs = (List<FilterPair>) Sessions
.getCurrent().getAttribute("companyFilterLabel");
if (sessionFilterPairs != null && !sessionFilterPairs.isEmpty()) {
bdFilters.clear();
for (FilterPair filterPair : sessionFilterPairs) {
bdFilters.addSelectedElement(filterPair);
}
@ -342,6 +343,7 @@ public class CompanyPlanningController implements Composer {
"companyFilterStartDate"));
filterFinishDate.setValue((Date) Sessions.getCurrent().getAttribute(
"companyFilterFinishDate"));
loadPredefinedBandboxFilter();
}
public void onApplyFilter() {