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

Make coherent behavior of bandbox with the rest of elements in the filtering bar

Browse source 
When the user selects changes any element, the filter is applied without having
to use the filter button.

Once this is also working for the bandbox, the filter button has no sense
anymore so it has been removed.a

FEA: ItEr76S23ImproveFilteringArea
This commit is contained in:
Manuel Rego Casasnovas 2012-04-13 08:49:20 +02:00
parent 06b4899bb0
commit b33e72e079
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java
View file

@ -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 "<code>;</code>".<br />
*
* When an element is selected {@link Events.ON_CHANGE} event over this
* component is launched.
*
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
@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() {

20
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
View file

@ -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 <ogonzalez@igalia.com>
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
@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() {