Notify the user that we are just fetching the first 5000 submissions.…

… Pagination is too slow client-side.
posm · Dec 6, 2016 · 83e1b21 · 83e1b21
1 parent 6e017e0
commit 83e1b21
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 18 deletions.
diff --git a/jekyll/js/submissions/index.js b/jekyll/js/submissions/index.js
@@ -128,11 +128,7 @@ function doCSV(json) {
     // show raw data if people really want it
     $(".csv textarea").val(csv);
 
-    // download link to entire CSV as data
-    // thanks to http://jsfiddle.net/terryyounghk/KPEGU/
-    // and http://stackoverflow.com/questions/14964035/how-to-export-javascript-array-info-to-csv-on-client-side
-    var uri = "data:text/csv;charset=utf-8," + encodeURIComponent(csv);
-    $("#downloadCsv").attr("href", uri).attr("download", getParam('form') + ".csv");
+    $("#downloadCsv").attr("href", OMK.csvUrl()).attr("download", getParam('form') + ".csv");
     $("#downloadJson").attr("href", OMK.jsonUrl()).attr("download", getParam('form') + ".json");
 }
 

diff --git a/jekyll/js/submissions/omk.js b/jekyll/js/submissions/omk.js
@@ -7,7 +7,22 @@ OMK.fetch = function (cb) {
     OMK.getFormMetaData(function(metadata) {
         OMK.fetchJSON(OMK.jsonUrl() + '?offset=0&limit=' + OMK._PAGINATION_LIMIT, function() {
             cb();
+            // pagination too slow
             // OMK.paginate(metadata.total);
+
+            if (OMK._PAGINATION_LIMIT < metadata.total) {
+                var toastOptions = {
+                    style: {
+                        main: {
+                            background: "#f2dede",
+                            color: "#a94442",
+                            'box-shadow': '0 0 0px'
+                        }
+                    }
+                };
+                iqwerty.toast.Toast('The data set is large. We have loaded ' + OMK._PAGINATION_LIMIT +
+                    ' of ' + metadata.total + ' submissions. Download the ODK CSV or JSON data to get the rest.', toastOptions);
+            }
         });
     });
 };
@@ -23,6 +38,11 @@ OMK.jsonUrl = function () {
     return json;
 };
 
+OMK.csvUrl = function () {
+    var form = getParam('form');
+    return OMK.omkServerUrl() + '/omk/odk/submissions/' + form + '.csv';
+};
+
 //Function to capitalise first character for strings
 function capitalizeFirstLetter(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -49,8 +69,14 @@ OMK.jsonPaginationUrl = function() {
     return OMK.jsonUrl() + '?offset=' + OMK._paginationOffset + '&limit=' + OMK._PAGINATION_LIMIT;
 };
 
+/**
+ * Doing recursive loads of pagination of data is quite slow and halts the UI.
+ * We're going to disable this for now...
+ *
+ * @param total
+ */
 OMK.paginate = function (total) {
-    setTimeout(function() {
+    setTimeout(function() { // timeouts dont completely fix the UI from halting...
         OMK._paginationOffset += OMK._PAGINATION_LIMIT;
         if (OMK._paginationOffset < total) {
             $.get(OMK.jsonPaginationUrl(), function (data, status, xhr) {

diff --git a/jekyll/submissions/index.html b/jekyll/submissions/index.html
@@ -36,9 +36,6 @@ <h2 class="rows count mdl-card__title-text"></h2>
                     </a>
 
                     <ul class="mdl-menu mdl-menu--bottom-right- mdl-js-menu mdl-js-ripple-effect" for="odk-options">
-                        <a href="#">
-                            <li class="showRawCSV mdl-menu__item">View CSV</li>
-                        </a>
                         <a id="downloadCsv" download="data.csv" href="#" class="download">
                             <li class="mdl-menu__item">Download CSV</li>
                         </a>

diff --git a/pages/js/submissions/index.js b/pages/js/submissions/index.js
@@ -128,11 +128,7 @@ function doCSV(json) {
     // show raw data if people really want it
     $(".csv textarea").val(csv);
 
-    // download link to entire CSV as data
-    // thanks to http://jsfiddle.net/terryyounghk/KPEGU/
-    // and http://stackoverflow.com/questions/14964035/how-to-export-javascript-array-info-to-csv-on-client-side
-    var uri = "data:text/csv;charset=utf-8," + encodeURIComponent(csv);
-    $("#downloadCsv").attr("href", uri).attr("download", getParam('form') + ".csv");
+    $("#downloadCsv").attr("href", OMK.csvUrl()).attr("download", getParam('form') + ".csv");
     $("#downloadJson").attr("href", OMK.jsonUrl()).attr("download", getParam('form') + ".json");
 }
 

diff --git a/pages/js/submissions/omk.js b/pages/js/submissions/omk.js
@@ -7,7 +7,22 @@ OMK.fetch = function (cb) {
     OMK.getFormMetaData(function(metadata) {
         OMK.fetchJSON(OMK.jsonUrl() + '?offset=0&limit=' + OMK._PAGINATION_LIMIT, function() {
             cb();
+            // pagination too slow
             // OMK.paginate(metadata.total);
+
+            if (OMK._PAGINATION_LIMIT < metadata.total) {
+                var toastOptions = {
+                    style: {
+                        main: {
+                            background: "#f2dede",
+                            color: "#a94442",
+                            'box-shadow': '0 0 0px'
+                        }
+                    }
+                };
+                iqwerty.toast.Toast('The data set is large. We have loaded ' + OMK._PAGINATION_LIMIT +
+                    ' of ' + metadata.total + ' submissions. Download the ODK CSV or JSON data to get the rest.', toastOptions);
+            }
         });
     });
 };
@@ -23,6 +38,11 @@ OMK.jsonUrl = function () {
     return json;
 };
 
+OMK.csvUrl = function () {
+    var form = getParam('form');
+    return OMK.omkServerUrl() + '/omk/odk/submissions/' + form + '.csv';
+};
+
 //Function to capitalise first character for strings
 function capitalizeFirstLetter(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -49,8 +69,14 @@ OMK.jsonPaginationUrl = function() {
     return OMK.jsonUrl() + '?offset=' + OMK._paginationOffset + '&limit=' + OMK._PAGINATION_LIMIT;
 };
 
+/**
+ * Doing recursive loads of pagination of data is quite slow and halts the UI.
+ * We're going to disable this for now...
+ *
+ * @param total
+ */
 OMK.paginate = function (total) {
-    setTimeout(function() {
+    setTimeout(function() { // timeouts dont completely fix the UI from halting...
         OMK._paginationOffset += OMK._PAGINATION_LIMIT;
         if (OMK._paginationOffset < total) {
             $.get(OMK.jsonPaginationUrl(), function (data, status, xhr) {

diff --git a/pages/submissions/index.html b/pages/submissions/index.html
@@ -83,9 +83,6 @@ <h2 class="rows count mdl-card__title-text"></h2>
                     </a>
 
                     <ul class="mdl-menu mdl-menu--bottom-right- mdl-js-menu mdl-js-ripple-effect" for="odk-options">
-                        <a href="#">
-                            <li class="showRawCSV mdl-menu__item">View CSV</li>
-                        </a>
                         <a id="downloadCsv" download="data.csv" href="#" class="download">
                             <li class="mdl-menu__item">Download CSV</li>
                         </a>