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

Enabled WBS to write filter changes on the session

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-06 12:41:15 +01:00
parent ed24855836
commit 8bce318265
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
View file

@ -44,6 +44,7 @@ import org.libreplan.business.orders.entities.SchedulingState;
import org.libreplan.business.requirements.entities.CriterionRequirement;
import org.libreplan.business.templates.entities.OrderElementTemplate;
import org.libreplan.business.users.entities.UserRole;
import org.libreplan.web.common.FilterUtils;
import org.libreplan.web.common.IMessagesForUser;
import org.libreplan.web.common.Level;
import org.libreplan.web.common.Util;
@ -59,7 +60,6 @@ import org.zkoss.ganttz.IPredicate;
import org.zkoss.ganttz.util.ComponentsFinder;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.Sessions;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
@ -280,30 +280,22 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
}
private void importOrderFiltersFromSession() {
filterNameOrderElement.setValue((String) Sessions.getCurrent()
.getAttribute(
orderModel.getOrder().getCode() + "-tasknameFilter"));
filterStartDateOrderElement.setValue((Date) Sessions.getCurrent()
.getAttribute(
orderModel.getOrder().getCode() + "-startDateFilter"));
filterFinishDateOrderElement.setValue((Date) Sessions.getCurrent()
.getAttribute(
orderModel.getOrder().getCode() + "-endDateFilter"));
if (Sessions.getCurrent().getAttribute(
orderModel.getOrder().getCode() + "-labelsandcriteriaFilter") != null) {
for (Object each : (List<Object>) Sessions.getCurrent()
.getAttribute(
orderModel.getOrder().getCode()
+ "-labelsandcriteriaFilter")) {
String orderCode = orderModel.getOrder().getCode();
filterNameOrderElement.setValue(FilterUtils
.readOrderTaskName(orderCode));
filterStartDateOrderElement.setValue(FilterUtils
.readOrderStartDate(orderCode));
filterFinishDateOrderElement.setValue(FilterUtils
.readOrderEndDate(orderCode));
if (FilterUtils.readOrderParameters(orderCode) != null) {
for (Object each : (List<Object>) FilterUtils
.readOrderParameters(orderCode)) {
bdFiltersOrderElement.addSelectedElement(each);
}
}
if (Sessions.getCurrent().getAttribute(
orderModel.getOrder().getCode() + "-inheritanceFilter") != null) {
labelsWithoutInheritance.setChecked((Boolean) Sessions.getCurrent()
.getAttribute(
orderModel.getOrder().getCode()
+ "-inheritanceFilter"));
if (FilterUtils.readOrderInheritance(orderCode) != null) {
labelsWithoutInheritance.setChecked(FilterUtils
.readOrderInheritance(orderCode));
}
}
@ -559,6 +551,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
* Apply filter to order elements in current order
*/
public void onApplyFilter() {
writeFilterParameters();
OrderElementPredicate predicate = createPredicate();
this.predicate = predicate;
@ -569,6 +562,16 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
}
}
private void writeFilterParameters() {
String orderCode = orderModel.getOrder().getCode();
FilterUtils.writeOrderStartDate(orderCode,
filterStartDateOrderElement.getValue());
FilterUtils.writeOrderEndDate(orderCode,
filterFinishDateOrderElement.getValue());
FilterUtils.writeOrderTaskName(orderCode,
filterNameOrderElement.getValue());
}
private OrderElementPredicate createPredicate() {
List<FilterPair> listFilters = (List<FilterPair>) bdFiltersOrderElement
.getSelectedElements();