Changeset 4665

Timestamp:

03/10/14 14:35:18 (11 years ago)

Author:

Twan Goosen

Message:

Added a drop down to choose between sort modes for all values display

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• components/FieldValueOrderSelector.java (added)
• components/FieldValueOrderSelector.properties (added)
• panels/AllFacetValuesPanel.html (modified) (1 diff)
• panels/AllFacetValuesPanel.java (modified) (6 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.html

@@ -25 +25 @@
         <wicket:panel>
             <p>All values in this facet</p>
-            <p>Sort by <select><option>name</option><option>count</option></select></p>
-            <div>Search: <input type="text" /></div>
-            <div class="sortedFacet">
-<!--                <div>
-                    <div class="anchorpanel"><a href=""></a><span>A</span></div>
-                </div>-->
+            <form wicket:id="options">
+                <p>Sort by <select wicket:id="sort"><option>name</option><option>count</option></select></p>
+                <div>Search: <input type="text" /></div>
+            </form>
+            <div wicket:id="facetValuesContainer" class="sortedFacet">
+                <!--                
+                    <div>
+                        <div class="anchorpanel"><a href=""></a><span>A</span></div>
+                    </div>
+                -->
                 <div wicket:id="facetValue">
                     <div class="facetLinkPanel"><a wicket:id="facetSelect" href=""><span wicket:id="name">A Corpus</span></a> (<span wicket:id="count">1</span>)</div>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels;
 
+import eu.clarin.cmdi.vlo.wicket.components.FieldValueOrderSelector;
+import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
 import java.util.Collection;
@@ -22 +24 @@
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.GenericPanel;
@@ -30 +37 @@
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
 
 /**
+ * A panel that shows all available values for a selected facet. Supports two
+ * ordering modes (by name or result count) and dynamic filtering.
  *
  * @author twagoo
@@ -37 +47 @@
 public abstract class AllFacetValuesPanel extends GenericPanel<FacetField> {
 
+    private final FacetFieldValuesProvider valuesProvider;
+    private final WebMarkupContainer valuesContainer;
+
     public AllFacetValuesPanel(String id, IModel<FacetField> model) {
         super(id, model);
+        valuesProvider = new FacetFieldValuesProvider(model);
 
-        // provider that extracts values and counts from FacetField
-        final FacetFieldValuesProvider valuesProvider = new FacetFieldValuesProvider(model);
-        add(new DataView<FacetField.Count>("facetValue", valuesProvider) {
+        valuesContainer = new WebMarkupContainer("facetValuesContainer");
+        valuesContainer.setOutputMarkupId(true);
+        add(valuesContainer);
+
+        final DataView<FacetField.Count> valuesView = createValuesView("facetValue");
+        valuesContainer.add(valuesView);
+
+        final Form optionsForm = createOptionsForm("options");
+        optionsForm.setOutputMarkupId(true);
+        add(optionsForm);
+    }
+
+    private DataView<FacetField.Count> createValuesView(String id) {
+        return new DataView<FacetField.Count>(id, valuesProvider) {
 
             @Override
@@ -69 +94 @@
                 item.add(new Label("count"));
             }
+        };
+    }
+
+    private Form createOptionsForm(String id) {
+        final Form options = new Form(id);
+        final DropDownChoice<SortParam<FieldValuesOrder>> sortSelect
+                = new FieldValueOrderSelector("sort", new PropertyModel<SortParam<FieldValuesOrder>>(valuesProvider, "sort"));
+        sortSelect.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                target.add(options);
+                target.add(valuesContainer);
+            }
         });
+        options.add(sortSelect);
+        return options;
     }
 
@@ -81 +122 @@
      */
     protected abstract void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target);
-
 }