drillthrough fixes, drillthrough for cells

Author: nikitaeverywhere

example/index.html

@@ -35,7 +35,8 @@
         <a onclick="rSoon(this)">6</a>,
         <a onclick="rSoon(this)">7</a>,
         <a onclick="rSoon(this)">8</a>,
-        <a onclick="rSoon(this)">9</a>
+        <a onclick="rSoon(this)">9</a>,
+        <a onclick="rSoon(this)">10</a>
     </div>
     <div id="mdx"></div>
     <form id="mdxForm" onsubmit="return false;">
@@ -64,6 +65,7 @@
                 "SELECT NON EMPTY [Product].[P1].[Product Category].Members ON 0,{[Measures].[%COUNT]} ON 1 FROM [HoleFoods] %FILTER [Measures].[%COUNT]",
                 "SELECT NON EMPTY [Product].[P1].[Product Category].Members ON 0, NON EMPTY [Outlet].[H1].[Region].Members ON 1 FROM [HoleFoods]",
                 "SELECT NON EMPTY [Product].[P1].[Product Category].Members ON 0,NON EMPTY [DateOfSale].[Actual].[YearSold].&[2010].children ON 1 FROM [HoleFoods] %FILTER [DateOfSale].[Actual].[YearSold].&[2010] %FILTER [Measures].[%COUNT]",
+                "SELECT NON EMPTY [Product].[P1].[Product Category].Members ON 0,NON EMPTY [DateOfSale].[Actual].[YearSold].Members ON 1 FROM [HoleFoods]",
                 "SELECT NON EMPTY [Product].[P1].[Product Category].Members ON 0,NON EMPTY [DateOfSale].[Actual].[YearSold].Members ON 1 FROM [HoleFoods]"
             ][v];
 

source/css/LightPivot.css

@@ -177,20 +177,20 @@
     background: #e2c8ff;
 }
 
-.orderedDec {
-    background: red;
-}
-
-.orderedAsc {
-    background: orange;
-}
-
 .lpt td {
     background: #E1E8FF;
+    -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
 }
 
 .lpt tr:hover td {
-    background: #FFDEBF;
+    background: #ffe6cf;
+}
+
+.lpt table td:hover {
+    background: #e2c8ff;
 }
 
 .lpt tbody > tr > th {

source/js/LightPivotTable.js

@@ -91,15 +91,24 @@ LightPivotTable.prototype.tryDrillDown = function (filter) {
 
 };
 
-LightPivotTable.prototype.showDrillThrough = function () {
+/**
+ * @param {string[]} [filters]
+ */
+LightPivotTable.prototype.showDrillThrough = function (filters) {
 
     var _ = this,
         ds = {};
 
     // clone dataSource config object
     for (var i in _.CONFIG.dataSource) { ds[i] = _.CONFIG.dataSource[i]; }
     ds.action = "MDXDrillthrough";
-    ds.basicMDX = this.mdxParser.drillThrough(ds.basicMDX) || ds.basicMDX;
+    if (filters instanceof Array) {
+        ds.basicMDX = this.mdxParser.customDrillThrough(this.dataSource.BASIC_MDX, filters)
+            || this.dataSource.basicMDX;
+    } else {
+        ds.basicMDX = this.dataSource.BASIC_MDX;
+        ds.basicMDX = this.mdxParser.drillThrough(ds.basicMDX) || ds.basicMDX;
+    }
 
     this.pushDataSource(ds);
 

source/js/MDXParser.js

@@ -58,4 +58,23 @@ MDXParser.prototype.drillThrough = function (basicMDX) {
 
     }
 
+};
+
+/**
+ * @param {string} basicMDX
+ * @param {string[]} filters
+ */
+MDXParser.prototype.customDrillThrough = function (basicMDX, filters) {
+
+    var cubeName = basicMDX.split(/FROM\s*\[([^\]]*)]/i)[1],
+        query = "DRILLTHROUGH SELECT FROM [" + cubeName + "]";
+
+    if (!(filters instanceof Array)) filters = [filters];
+
+    for (var i in filters) {
+        query += " %FILTER " + filters[i];
+    }
+
+    return query;
+
 };

source/js/PivotView.js

@@ -134,7 +134,10 @@ PivotView.prototype._rowClickHandler = function (rowIndex, cellData) {
 
 };
 
-PivotView.prototype._backClickHandler = function () {
+PivotView.prototype._backClickHandler = function (event) {
+
+    event.cancelBubble = true;
+    event.stopPropagation();
 
     this.popTable();
     this.controller.popDataSource();
@@ -150,6 +153,22 @@ PivotView.prototype._drillThroughClickHandler = function (event) {
 
 };
 
+PivotView.prototype._cellClickHandler = function (x, y) {
+
+    var data = this.controller.dataController.getData(),
+        f1, f2;
+
+    try {
+        f1 = data.rawData[y][data.info.leftHeaderColumnsNumber - 1].source.path;
+        f2 = data.rawData[data.info.topHeaderRowsNumber - 1][x].source.path;
+    } catch (e) {
+        console.warn("Unable to get filters for cell (%d, %d)", x, y);
+    }
+
+    this.controller.showDrillThrough([f1, f2]);
+
+};
+
 PivotView.prototype.fixSizes = function (baseElement, elementToFix) {
 
     if (!elementToFix.style) return false;
@@ -242,8 +261,9 @@ PivotView.prototype.fixHeaders = function (tableElement) {
 
     // add scroll listener
     tableElement.parentNode.addEventListener("scroll", this._scrollListener = function () {
-        hHead.style.top = fhx.style.top = tableElement.parentNode.scrollTop + "px";
-        hHead.style.left = fhy.style.left = tableElement.parentNode.scrollLeft + "px";
+            if (!tableElement.parentNode) return; // toFix
+            hHead.style.top = fhx.style.top = tableElement.parentNode.scrollTop + "px";
+            hHead.style.left = fhy.style.left = tableElement.parentNode.scrollLeft + "px";
     }, false);
 
     // append new elements
@@ -379,8 +399,8 @@ PivotView.prototype.renderRawData = function (data) {
                     if (x === 0 && y === 0 && _.tablesStack.length > 1) {
                         var elt = document.createElement("div");
                         elt.className = "backButton";
-                        addTrigger(elt, "click", function () {
-                            _._backClickHandler.call(_);
+                        addTrigger(elt, "click", function (event) {
+                            _._backClickHandler.call(_, event);
                         });
                         td.insertBefore(elt, td.childNodes[td.childNodes.length - 1] || null);
                     }
@@ -415,8 +435,12 @@ PivotView.prototype.renderRawData = function (data) {
                 var span = document.createElement("span");
                 span.textContent = data[y][x].value;
                 td.appendChild(span);
-                //td.textContent = ;
                 tr.appendChild(td);
+                if (x >= headLeftColsNum && y >= headRowsNum) {
+                    (function (x, y) {addTrigger(td, "click", function () {
+                        _._cellClickHandler.call(_, x, y);
+                    })})(x, y);
+                }
             }
 
             if (x === 0 && y === 0 && _.controller.dataController.getData().info.action === "MDX") {