diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java index 96d83463e..435bd97dd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-2012 Igalia, S.L. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -53,9 +53,15 @@ import org.zkoss.zul.SimpleListModel; import org.zkoss.zul.api.Listbox; /** + * {@link Bandbox} allowing to choose more than one element from the drop down + * list separating them by ";".
+ * + * When an element is selected {@link Events.ON_CHANGE} event over this + * component is launched. + * * @author Susana Montes Pedreira + * @author Manuel Rego Casasnovas */ - @SuppressWarnings("serial") public class BandboxMultipleSearch extends HtmlMacroComponent { @@ -168,6 +174,7 @@ public class BandboxMultipleSearch extends HtmlMacroComponent { } } bandbox.close(); + Events.postEvent(Events.ON_CHANGE, this, null); } private void searchMultipleFilters() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java index b0f35b7e2..2d490586b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-2012 Igalia, S.L. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -81,7 +81,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.zk.ui.util.Composer; -import org.zkoss.zul.Button; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Hbox; @@ -96,7 +95,9 @@ import org.zkoss.zul.api.Combobox; /** * Controller for global resourceload view + * * @author Óscar González Fernández + * @author Manuel Rego Casasnovas */ @Component @Scope(BeanDefinition.SCOPE_PROTOTYPE) @@ -522,29 +523,22 @@ public class ResourceLoadController implements Composer { panel.setSecondOptionalFilter(buildBandboxFilterer()); } - private Hbox buildBandboxFilterer() { + private BandboxMultipleSearch buildBandboxFilterer() { bandBox.setId("workerBandboxMultipleSearch"); bandBox.setWidthBandbox("185px"); bandBox.setWidthListbox("450px"); bandBox.setFinder(getFinderToUse()); bandBox.afterCompose(); - Button button = new Button(); - button.setImage("/common/img/ico_filter.png"); - button.setTooltip(_("Filter by worker")); - button.addEventListener(Events.ON_CLICK, new EventListener() { + bandBox.addEventListener(Events.ON_CHANGE, new EventListener() { @Override - public void onEvent(Event event) { + public void onEvent(Event event) throws Exception { entitiesSelected = getSelected(); notifyChange(); } }); - Hbox hbox = new Hbox(); - hbox.appendChild(bandBox); - hbox.appendChild(button); - hbox.setAlign("center"); - return hbox; + return bandBox; } private String getFinderToUse() {