Changeset 4554

Timestamp:

02/25/14 11:10:04 (10 years ago)

Author:

twagoo

Message:

added selector for number of results per page

Location:

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

Files:

• SearchResultsPanel.html (modified) (1 diff)
• SearchResultsPanel.java (modified) (6 diffs)

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

@@ -115 +115 @@
                 <wicket:container wicket:id="pagingBottom">[PAGING]</wicket:container>
 
-                <form id="resultpagesizeform">
+                <form wicket:id="resultPageSizeForm" id="resultpagesizeform">
                     <label for="resultpagesize">Results per page:</label>
-                    <select id="resultpagesize">
+                    <select wicket:id="resultPageSize" id="resultpagesize">
                         <option>5</option>
                         <option>10</option>

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

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
 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.navigation.paging.IPageableItems;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -33 +39 @@
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -41 +48 @@
  */
 public class SearchResultsPanel extends Panel {
+
+    public static final List<Long> ITEMS_PER_PAGE_OPTIONS = Arrays.asList(5L, 10L, 25L, 50L, 100L);
 
     @SpringBean
@@ -64 +73 @@
         add(createResultPageIndicator("resultPageIndicator", resultsView));
 
+        // form to select number of results per page
+        add(createResultPageSizeForm("resultPageSizeForm", resultsView));
+
         //For Ajax updating of search results
         setOutputMarkupId(true);
@@ -84 +96 @@
     private Label createResultCount(String id) {
         final IModel<String> resultCountModel = new AbstractReadOnlyModel<String>() {
-            
+
             @Override
             public String getObject() {
@@ -106 +118 @@
     }
 
+    private Form createResultPageSizeForm(String id, final IPageableItems resultsView) {
+        final Form resultPageSizeForm = new Form(id);
+
+        final DropDownChoice<Long> pageSizeDropDown
+                = new DropDownChoice<Long>("resultPageSize",
+                        // bind to items per page property of pageable
+                        new PropertyModel<Long>(resultsView, "itemsPerPage"),
+                        ITEMS_PER_PAGE_OPTIONS);
+        pageSizeDropDown.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                target.add(SearchResultsPanel.this);
+            }
+        });
+        resultPageSizeForm.add(pageSizeDropDown);
+
+        return resultPageSizeForm;
+    }
+
     public static class SolrFieldLabel extends Label {