DeepSee pagination bind, last cell size fix

Author: nikitaeverywhere

export/LightPivotTable-DeepSeePortlet.xml

@@ -11,7 +11,7 @@
 
 <Class name="DeepSee.LightPivotTable">
 <Super>%DeepSee.Component.Portlet.abstractPortlet</Super>
-<TimeChanged>63566,64710.965337</TimeChanged>
+<TimeChanged>63572,75641.723765</TimeChanged>
 <TimeCreated>63515,61322.546099</TimeCreated>
 
 <Parameter name="INCLUDEFILES">
@@ -30,6 +30,10 @@
 <Type>%Boolean</Type>
 </Property>
 
+<Property name="Pagination">
+<Type>%Boolean</Type>
+</Property>
+
 <Method name="%OnGetPortletName">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
@@ -54,6 +58,7 @@
     set pInfo($I(pInfo)) = $LB("DataSource", "/" _ $NAMESPACE, "%String", $$$Text("MDX2JSON source", "%DeepSee"), "Set the URL of MDX2JSON source. Example: ""/SAMPLES""")
     set pInfo($I(pInfo)) = $LB("ShowSummary", 1, "%Boolean", $$$Text("Show summary", "%DeepSee"), "Show summary row")
     set pInfo($I(pInfo)) = $LB("ExportCSV", 1, "%Boolean", $$$Text("Export to CSV", "%DeepSee"), "Show export to CSV format button")
+    set pInfo($I(pInfo)) = $LB("Pagination", 0, "%Integer", $$$Text("Pagination", "%DeepSee"), "Enable pagination")
 
     quit $$$OK
 ]]></Implementation>
@@ -222,6 +227,9 @@
                 if (controller && controller["data"] && !setup.caption) setup.caption = controller["data"]["defaultCaption"] || "";
                 if (info["drillDownDataSource"]) setup["drillDownTarget"] = info["drillDownDataSource"];
                 setup["showSummary"] = !!parseInt(container.getAttribute("show-summary"));
+                if (parseInt(container.getAttribute("pagination"))) {
+                    setup["pagination"] = parseInt(container.getAttribute("pagination"))
+                }
 
                 _.LightPivotTable = new LightPivotTable(setup);
             }
@@ -310,7 +318,7 @@
     }
 
     &html<
-        <div export-csv="#(..ExportCSV)#" data-source="#(..DataSource)#" show-summary="#(..ShowSummary)#" class="lpt-container" style="position: absolute; left: 0; bottom: 0; width: 100%; height: 100%;">
+        <div pagination="#(..Pagination)#" export-csv="#(..ExportCSV)#" data-source="#(..DataSource)#" show-summary="#(..ShowSummary)#" class="lpt-container" style="position: absolute; left: 0; bottom: 0; width: 100%; height: 100%;">
 
         </div>
     >

source/js/DataSource.js

@@ -158,7 +158,7 @@ DataSource.prototype.getCurrentData = function (callback) {
 
         var data = ready.data;
 
-        //console.log("Retrieved data:", ready);
+        console.log("Retrieved data:", ready);
 
         if (mdxType === "drillthrough") {
             callback((function (data) {

source/js/PivotView.js

@@ -437,7 +437,8 @@ PivotView.prototype.recalculateSizes = function (container) {
             headerH = topHeader.offsetHeight,
             containerHeight = container.offsetHeight,
             mainHeaderWidth = headerContainer.offsetWidth,
-            hasVerticalScrollBar = lTableHead.offsetHeight > containerHeight - headerH - pagedHeight,
+            hasVerticalScrollBar = Math.max(lTableHead.offsetHeight, pTableHead.offsetHeight)
+                > containerHeight - headerH - pagedHeight,
             addExtraLeftHeaderCell = lTableHead.offsetHeight > containerHeight - headerH - pagedHeight
                 && this.SCROLLBAR_WIDTH > 0,
             cell, tr, cellWidths = [], columnHeights = [], i;