[Bigdata-commit] SF.net SVN: bigdata:[8145] branches/RDR/bigdata-war/src/html

[<tob...@us...>]

Revision: 8145
          http://sourceforge.net/p/bigdata/code/8145
Author:   tobycraig
Date:     2014-04-29 23:37:02 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
Improved pagination

Modified Paths:
--------------
    branches/RDR/bigdata-war/src/html/index.html
    branches/RDR/bigdata-war/src/html/js/workbench.js

Modified: branches/RDR/bigdata-war/src/html/index.html
===================================================================
--- branches/RDR/bigdata-war/src/html/index.html	2014-04-29 23:20:01 UTC (rev 8144)
+++ branches/RDR/bigdata-war/src/html/index.html	2014-04-29 23:37:02 UTC (rev 8145)
@@ -109,12 +109,12 @@
         </div>
 
         <div id="query-pagination" class="box">
-          <span id="current-results"></span>
+          Total results: <span id="total-results"></span>, displaying <span id="current-results"></span>
           <select id="results-per-page">
-            <option>10</option>
             <option>25</option>
-            <option>50</option>
+            <option selected>50</option>
             <option>100</option>
+            <option>all</option>
           </select> per page
           <div id="page-selector">
             <button id="previous-page">&#9664;</button>

Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-29 23:20:01 UTC (rev 8144)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-29 23:37:02 UTC (rev 8145)
@@ -2,7 +2,7 @@
 
 // global variables
 var DEFAULT_NAMESPACE, NAMESPACE, NAMESPACE_URL, NAMESPACES_READY, NAMESPACE_SHORTCUTS, FILE_CONTENTS, QUERY_RESULTS;
-var PAGE_SIZE=10, TOTAL_PAGES, CURRENT_PAGE;
+var PAGE_SIZE = 50, TOTAL_PAGES, CURRENT_PAGE;
 
 /* Modal functions */
 
@@ -686,6 +686,7 @@
       thead.append(tr);
       table.append(thead);
 
+      $('#total-results').html(data.results.bindings.length);
       setNumberOfPages();
       showPage(1);
 
@@ -737,9 +738,13 @@
 }
 
 function setPageSize(n) {
-   n = parseInt(n, 10);
-   if(typeof n != 'number' || n % 1 != 0 || n < 1 || n == PAGE_SIZE) {
-      return;
+   if(n == 'all') {
+      n = QUERY_RESULTS.results.bindings.length;
+   } else {
+      n = parseInt(n, 10);
+      if(typeof n != 'number' || n % 1 != 0 || n < 1 || n == PAGE_SIZE) {
+         return;
+      }
    }
 
    PAGE_SIZE = n;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.