Merge pull request #2174 from WikiWatershed/cpc/fix-analyze-chart-pag…

…ination Increase number of rows in pageable tables
WikiWatershed · Aug 24, 2017 · d5a4319 · d5a4319
2 parents 939943b + 621e892
commit d5a4319
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/mmw/js/src/analyze/views.js b/src/mmw/js/src/analyze/views.js
@@ -1098,7 +1098,7 @@ var PointSourceResultView = AnalyzeResultView.extend({
             associatedLayerCodes = ['pointsource'],
             avgRowHeight = 30,  // Most rows are between 2-3 lines, 12px per line
             minScreenHeight = 768 + 45, // height of landscape iPad + extra content below the table
-            pageSize = utils.calculateVisibleRows(minScreenHeight, avgRowHeight, 3),
+            pageSize = utils.calculateVisibleRows(minScreenHeight, avgRowHeight, 6),
             chart = null;
         this.showAnalyzeResults(coreModels.PointSourceCensusCollection,
             PointSourcePageableTableView, chart, title, source, helpText, associatedLayerCodes, pageSize);
@@ -1118,7 +1118,7 @@ var CatchmentWaterQualityResultView = AnalyzeResultView.extend({
             ],
             avgRowHeight = 18,  // Most rows are between 1-2 lines, 12px per line
             minScreenHeight = 768 + 45, // height of landscape iPad + extra content below the table
-            pageSize = utils.calculateVisibleRows(minScreenHeight, avgRowHeight, 5),
+            pageSize = utils.calculateVisibleRows(minScreenHeight, avgRowHeight, 6),
             chart = null;
         this.showAnalyzeResults(coreModels.CatchmentWaterQualityCensusCollection,
             CatchmentWaterQualityPageableTableView, chart, title, source, helpText,

diff --git a/src/mmw/js/src/core/models.js b/src/mmw/js/src/core/models.js
@@ -573,13 +573,13 @@ var AnimalCensusCollection = Backbone.Collection.extend({
 var PointSourceCensusCollection = Backbone.PageableCollection.extend({
     comparator: 'city',
     mode: 'client',
-    state: { pageSize: 3, firstPage: 1 }
+    state: { pageSize: 6, firstPage: 1 }
 });
 
 var CatchmentWaterQualityCensusCollection = Backbone.PageableCollection.extend({
     comparator: 'nord',
     mode: 'client',
-    state: { pageSize: 5, firstPage: 1 }
+    state: { pageSize: 6, firstPage: 1 }
 });
 
 var GeoModel = Backbone.Model.extend({

diff --git a/src/mmw/sass/pages/_analyze.scss b/src/mmw/sass/pages/_analyze.scss
@@ -141,6 +141,11 @@
 .pageable-table-container {
   overflow: visible;
   padding-bottom:10%;
+
+  tbody {
+    white-space: nowrap;
+  }
+
   @media (max-height: 884px) {
     padding-bottom:0px;
   }