From a0bc3eaa32ab476cb9c69027de16ef2f8989a1b3 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Thu, 21 Jan 2010 14:47:56 +0100 Subject: [PATCH] ItEr44S15RFNavegacionOrganizacionTraballoItEr43S20: Changed filtering orderelements by label component position --- .../orders/OrderElementTreeController.java | 42 +++---------------- .../navalplanner/web/orders/OrderModel.java | 4 +- .../main/webapp/common/css/navalpro_zk.css | 2 +- .../webapp/orders/_orderElementTreeFilter.zul | 12 +----- .../src/main/webapp/orders/_ordersTab.zul | 15 +------ 5 files changed, 13 insertions(+), 62 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java index 52d4adc7f..0a5b62ff7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java @@ -51,7 +51,6 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; import org.zkoss.zul.Constraint; import org.zkoss.zul.Datebox; import org.zkoss.zul.Intbox; @@ -71,8 +70,6 @@ public class OrderElementTreeController extends TreeController { private Vbox filter; - private Combobox cbFilterType; - private BandboxSearch bdFilter; private OrderElementTreeitemRenderer renderer = new OrderElementTreeitemRenderer(); @@ -154,8 +151,11 @@ public class OrderElementTreeController extends TreeController { @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - Executions.createComponents("/orders/_orderElementTreeFilter.zul", + Component filterComponent = Executions.createComponents( + "/orders/_orderElementTreeFilter.zul", filter, new HashMap()); + filterComponent.setVariable("treeController", this, true); + bdFilter = (BandboxSearch) filterComponent.getFellow("bdFilter"); } public class OrderElementTreeitemRenderer extends Renderer { @@ -400,46 +400,18 @@ public class OrderElementTreeController extends TreeController { return predicate != null; } - private final String SHOW_ALL = _("Show all"); - - /** - * Show all order elements in current order - * @param event - */ - public void onShowAll(Event event) { - final String selectedOption = ((Combobox) event.getTarget()).getValue(); - if (SHOW_ALL.equals(selectedOption)) { - // Delete predicate and set back to original tree model - if (predicate != null) { - bdFilter.clear(); - predicate = null; - Util.reloadBindings(tree); - } - bdFilter.setDisabled(true); - } else { - bdFilter.setDisabled(false); - } - } - - private final String FILTER_BY_LABEL = _("Filter by Label"); - /** * Apply filter to order elements in current order * @param event */ public void onApplyFilter(Event event) { - final String selectedOption = cbFilterType.getValue(); - // Filter order elements by label - if (FILTER_BY_LABEL.equals(selectedOption)) { org.navalplanner.business.labels.entities.Label label = getSelectedLabel(); if (label == null) { - label = org.navalplanner.business.labels.entities.Label - .create(""); + label = org.navalplanner.business.labels.entities.Label.create(""); } // Create predicate and filter order elements by predicate predicate = new LabelOrderElementPredicate(label); filterByPredicate(); - } } private org.navalplanner.business.labels.entities.Label getSelectedLabel() { @@ -458,9 +430,7 @@ public class OrderElementTreeController extends TreeController { */ public void clear() { selectDefaultTab(); - cbFilterType.setSelectedIndex(0); // Select show all option - bdFilter.setDisabled(true); // Disable when show all option is selected - bdFilter.clear(); + // bdFilter.clear(); predicate = null; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 40fd2322c..b944cabc7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -468,7 +468,9 @@ public class OrderModel implements IOrderModel { // Iterate through orderElements from order List orderElements = new ArrayList(); for (OrderElement orderElement : order.getOrderElements()) { - reattachOrderElement(orderElement); + if (!orderElement.isNewObject()) { + reattachOrderElement(orderElement); + } reattachLabels(); initializeLabels(orderElement.getLabels()); diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index 4b479b849..36fffca5c 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -430,7 +430,7 @@ div.z-errbox { .z-label,.z-radio-cnt,.z-checkbox-cnt,.z-slider-pp,input.button,input.file,.z-loading,.z-errbox, div.z-tree-footer-cnt, div.z-tree-cell-cnt, div.z-tree-col-cnt, .z-listbox, div.z-footer-cnt, div.z-row-cnt, div.z-group-cnt, div.z-group-foot-cnt, -div.z-column-cnt, div.z-list-footer-cnt, div.z-list-cell-cnt { +div.z-column-cnt, div.z-list-footer-cnt, div.z-list-cell-cnt, .z-bandbox, .z-bandbox-inp { font-family: Tahoma, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: normal; diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul index c49c75c29..4017c9313 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul @@ -1,16 +1,8 @@ - - - - +