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

Enabled filters memory mechanism on project edition

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-01 10:49:23 +01:00
parent ed69a6e7bc
commit fb68757b6d
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
View file

@ -62,6 +62,7 @@ import org.zkoss.ganttz.util.LongOperationFeedback;
import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation;
import org.zkoss.ganttz.util.ProfilingLogFactory;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.Sessions;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.util.Composer;
import org.zkoss.zk.ui.util.GenericForwardComposer;
@ -211,6 +212,8 @@ public class OrderPlanningController implements Composer {
private void updateConfiguration() {
if (order != null) {
importOrderFiltersFromSession();
long time = System.currentTimeMillis();
model.setConfigurationToPlanner(planner, order, viewSwitcher,
editTaskController, advancedAllocationTaskController,
@ -225,6 +228,20 @@ public class OrderPlanningController implements Composer {
}
}
private void importOrderFiltersFromSession() {
filterNameOrderElement.setValue((String) Sessions.getCurrent()
.getAttribute(order.getCode() + "-tasknameFilter"));
filterStartDateOrderElement.setValue((Date) Sessions.getCurrent()
.getAttribute(order.getCode() + "-startDateFilter"));
filterFinishDateOrderElement.setValue((Date) Sessions.getCurrent()
.getAttribute(order.getCode() + "-endDateFilter"));
if (Sessions.getCurrent().getAttribute(
order.getCode() + "-inheritanceFilter") != null) {
labelsWithoutInheritance.setChecked((Boolean) Sessions.getCurrent()
.getAttribute(order.getCode() + "-inheritanceFilter"));
}
}
public EditTaskController getEditTaskController() {
return editTaskController;
}
@ -261,7 +278,17 @@ public class OrderPlanningController implements Composer {
&& name == null) {
return null;
}
Sessions.getCurrent().setAttribute(order.getCode() + "-tasknameFilter",
name);
Sessions.getCurrent().setAttribute(
order.getCode() + "-startDateFilter", startDate);
Sessions.getCurrent().setAttribute(order.getCode() + "-endDateFilter",
finishDate);
Sessions.getCurrent()
.setAttribute(order.getCode() + "-inheritanceFilter",
ignoreLabelsInheritance);
Sessions.getCurrent().setAttribute(
order.getCode() + "-labelsandcriteriaFilter", listFilters);
return new TaskElementPredicate(listFilters, startDate, finishDate,
name, ignoreLabelsInheritance);
}