ItEr41S20CUGravacionModelosUnidadesTraballoItEr40S25: Filter part is parametrized by the tree controller
This commit is contained in:
parent
0d8250e6b0
commit
c3f82fbe24
3 changed files with 23 additions and 17 deletions
|
|
@ -47,6 +47,7 @@ import org.navalplanner.web.common.Util.Setter;
|
|||
import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch;
|
||||
import org.navalplanner.web.templates.IOrderTemplatesControllerEntryPoints;
|
||||
import org.zkoss.zk.ui.Component;
|
||||
import org.zkoss.zk.ui.Executions;
|
||||
import org.zkoss.zk.ui.WrongValueException;
|
||||
import org.zkoss.zk.ui.event.DropEvent;
|
||||
import org.zkoss.zk.ui.event.Event;
|
||||
|
|
@ -68,6 +69,7 @@ import org.zkoss.zul.Treecell;
|
|||
import org.zkoss.zul.Treeitem;
|
||||
import org.zkoss.zul.TreeitemRenderer;
|
||||
import org.zkoss.zul.Treerow;
|
||||
import org.zkoss.zul.Vbox;
|
||||
|
||||
/**
|
||||
* Controller for {@link OrderElement} tree view of {@link Order} entities <br />
|
||||
|
|
@ -76,6 +78,8 @@ import org.zkoss.zul.Treerow;
|
|||
*/
|
||||
public class OrderElementTreeController extends GenericForwardComposer {
|
||||
|
||||
private Vbox filter;
|
||||
|
||||
private IMessagesForUser messagesForUser;
|
||||
|
||||
private Component messagesContainer;
|
||||
|
|
@ -293,6 +297,8 @@ public class OrderElementTreeController extends GenericForwardComposer {
|
|||
public void doAfterCompose(Component comp) throws Exception {
|
||||
super.doAfterCompose(comp);
|
||||
messagesForUser = new MessagesForUser(messagesContainer);
|
||||
Executions.createComponents("/orders/_orderElementTreeFilter.zul",
|
||||
filter, new HashMap<String, String>());
|
||||
}
|
||||
|
||||
public class OrderElementTreeitemRenderer implements TreeitemRenderer,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<hbox>
|
||||
<!-- Filter by label -->
|
||||
<combobox id="cbFilterType" value="${i18n:_('Show all')}"
|
||||
onChange="treeController.onShowAll(event)"
|
||||
constraint="no empty:${i18n:_('cannot be null or empty')}"
|
||||
readonly="true" >
|
||||
<comboitem label="${i18n:_('Show all')}"
|
||||
description="${i18n:_('Show all order elements')}" />
|
||||
<comboitem label="${i18n:_('Filter by Label')}"
|
||||
description="${i18n:_('Filter all order elements by label')}" />
|
||||
</combobox>
|
||||
<bandboxSearch id="bdFilter" finder="LabelBandboxFinder"
|
||||
model="@{treeController.labels}"/>
|
||||
<button label="${i18n:_('Filter')}" style="margin-top: -4px"
|
||||
onClick="treeController.onApplyFilter(event)"/>
|
||||
</hbox>
|
||||
|
|
@ -37,23 +37,7 @@
|
|||
onClick="treeController.removeOrderElement();" />
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox>
|
||||
<hbox>
|
||||
<!-- Filter by label -->
|
||||
<combobox id="cbFilterType" value="${i18n:_('Show all')}"
|
||||
onChange="treeController.onShowAll(event)"
|
||||
constraint="no empty:${i18n:_('cannot be null or empty')}"
|
||||
readonly="true" >
|
||||
<comboitem label="${i18n:_('Show all')}"
|
||||
description="${i18n:_('Show all order elements')}" />
|
||||
<comboitem label="${i18n:_('Filter by Label')}"
|
||||
description="${i18n:_('Filter all order elements by label')}" />
|
||||
</combobox>
|
||||
<bandboxSearch id="bdFilter" finder="LabelBandboxFinder"
|
||||
model="@{treeController.labels}"/>
|
||||
<button label="${i18n:_('Filter')}" style="margin-top: -4px"
|
||||
onClick="treeController.onApplyFilter(event)"/>
|
||||
</hbox>
|
||||
<vbox id="filter">
|
||||
</vbox>
|
||||
<vbox>
|
||||
<tree id="tree" width="1050" multiple="true" droppable="true"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue