Changeset 4553

Timestamp:

02/25/14 10:51:06 (10 years ago)

Author:

twagoo

Message:

added search result page indicator

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) (3 diffs)

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

@@ -27 +27 @@
             <div id="searchresultsheader">
                 <span wicket:id="resultCount" id="searchresultcount">604056 results</span>
-                <span id="searchresultpagecount">Showing 1 to 25</span>
+                <span wicket:id="resultPageIndicator" id="searchresultpagecount">Showing 1 to 25</span>
 
                 <div class="searchresultpagination">

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

@@ -26 +26 @@
 import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.navigation.paging.IPageableItems;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.Item;
@@ -48 +49 @@
         super(id, model);
         solrDocumentProvider = new SolrDocumentProvider(documentService, model);
-        add(new Label("resultCount", new AbstractReadOnlyModel<Long>() {
 
-            @Override
-            public Long getObject() {
-                return solrDocumentProvider.size();
-            }
-        }));
-        
-        final DataView<SolrDocument> resultsView = new DataView<SolrDocument>("resultItem", solrDocumentProvider, 10) {
-            
+        // dynamic results view
+        final DataView<SolrDocument> resultsView = createResultsView("resultItem");
+        add(resultsView);
+
+        // pagination navigators
+        add(new AjaxPagingNavigator("pagingTop", resultsView));
+        add(new AjaxPagingNavigator("pagingBottom", resultsView));
+
+        // total result counter
+        add(createResultCount("resultCount"));
+
+        // page result indicater
+        add(createResultPageIndicator("resultPageIndicator", resultsView));
+
+        //For Ajax updating of search results
+        setOutputMarkupId(true);
+    }
+
+    private DataView<SolrDocument> createResultsView(String id) {
+        final DataView<SolrDocument> resultsView = new DataView<SolrDocument>(id, solrDocumentProvider, 10) {
+
             @Override
             protected void populateItem(Item<SolrDocument> item) {
@@ -66 +79 @@
             }
         };
-        add(resultsView);
+        return resultsView;
+    }
 
-        add(new AjaxPagingNavigator("pagingTop", resultsView));
-        add(new AjaxPagingNavigator("pagingBottom", resultsView));
-        
-        //For Ajax updating of search results
-        setOutputMarkupId(true);
+    private Label createResultCount(String id) {
+        final IModel<String> resultCountModel = new AbstractReadOnlyModel<String>() {
+            
+            @Override
+            public String getObject() {
+                return String.format("%d results", solrDocumentProvider.size());
+            }
+        };
+        return new Label(id, resultCountModel);
+    }
+
+    private Label createResultPageIndicator(String id, final IPageableItems resultsView) {
+        IModel<String> indicatorModel = new AbstractReadOnlyModel<String>() {
+
+            @Override
+            public String getObject() {
+                final long firstShown = 1 + resultsView.getCurrentPage() * resultsView.getItemsPerPage();
+                final long lastShown = Math.min(resultsView.getItemCount(), firstShown + resultsView.getItemsPerPage() - 1);
+                return String.format("Showing %d to %d", firstShown, lastShown);
+            }
+        };
+        return new Label(id, indicatorModel);
     }