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

Write order filter bandbox from WBS screen

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-08 13:43:20 +01:00
parent b71ab8611e
commit cdd4c74c32
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Filter;
import javax.annotation.Resource;
@ -591,6 +592,27 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
FilterUtils
.writeOrderTaskName(order,
filterNameOrderElement.getValue());
FilterUtils.writeOrderInheritance(order,
labelsWithoutInheritance.isChecked());
List<FilterPair> result = new ArrayList<FilterPair>();
for (FilterPair filterPair : (List<FilterPair>) bdFiltersOrderElement
.getSelectedElements()) {
result.add(toTasKElementFilterEnum(filterPair));
}
FilterUtils.writeOrderParameters(order, result);
}
private FilterPair toTasKElementFilterEnum(FilterPair each) {
switch ((OrderElementFilterEnum) each.getType()) {
case Label:
return new FilterPair(TaskElementFilterEnum.Label,
each.getPattern(), each.getValue());
case Criterion:
return new FilterPair(TaskElementFilterEnum.Criterion,
each.getPattern(), each.getValue());
}
return null;
}
private OrderElementPredicate createPredicate() {

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

@ -237,8 +237,9 @@ public class OrderPlanningController implements Composer {
filterFinishDateOrderElement.setValue(FilterUtils
.readOrderEndDate(order));
if (FilterUtils.readOrderParameters(order) != null) {
bdFiltersOrderElement.clear();
for (Object each : FilterUtils.readOrderParameters(order)) {
bdFiltersOrderElement.addSelectedElement(each);
bdFiltersOrderElement.addSelectedElement(each);
}
}
if (FilterUtils.readOrderInheritance(order) != null) {