drillthrough, strings sort & little fixes

nikitaeverywhere · nikitaeverywhere · commit 49b51f7282e8 · 2014-11-19T00:35:55.000+02:00
diff --git a/source/css/LightPivot.css b/source/css/LightPivot.css
@@ -17,7 +17,13 @@
 }
 
 .lpt .backButton {
-    padding-left: 1.25em !important;
+    width: 14px;
+    height: 14px;
+    top: 1px;
+    padding: 2px;
+    vertical-align: middle;
+    display: inline-block;
+    position: relative;
 }
 
 .lpt .backButton:before, .lpt .backButton:after {
@@ -27,7 +33,7 @@
     display: block;
     height: 0.25em;
     position: absolute;
-    left: .5em;
+    left: 0;
     top: 50%;
     width: .8em;
     transition: background .4s ease;
@@ -57,8 +63,53 @@
     background: #C768FF;
 }
 
-.lpt .backButton:hover {
+.lpt table tr:first-child th:first-child {
+    position: relative;
+    white-space: nowrap;
+}
+
+.lpt .drillDownIcon {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    width: 15px;
+    height: 14px;
+    border: 2px solid #000000;
+    border-radius: 4px;
+    margin-right: .3em;
+    transition: all .4s ease;
+}
+
+.lpt .drillDownIcon:hover {
     background: #e2c8ff;
+    border-color: #C768FF;
+}
+
+.lpt .drillDownIcon:after {
+    content: "";
+    width: 10px;
+    height: 2px;
+    background-color: #000000;
+    border-radius: 4px;
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    box-shadow: 0 8px 0 #000000;
+}
+
+.lpt .drillDownIcon:before {
+    content: "";
+    width: 8px;
+    height: 2px;
+    background-color: #000000;
+    border-radius: 4px;
+    position: absolute;
+    top: 6px;
+    left: 2px;
+}
+
+.lpt .drillDownIcon:hover:before {
+    background-color: #C768FF;
 }
 
 .lpt .central > div {
diff --git a/source/js/DataController.js b/source/js/DataController.js
@@ -22,9 +22,9 @@ DataController.prototype.isValidData = function (data) {
     return data.dimensions instanceof Array
         && data.dimensions[0] instanceof Array
         && data.dimensions[0].length > 0
-        && data.dimensions[1].length > 0
+        //&& data.dimensions[1].length > 0
         && data.dimensions[0][0].hasOwnProperty("caption")
-        && data.dimensions[1][0].hasOwnProperty("caption")
+        //&& data.dimensions[1][0].hasOwnProperty("caption")
         && data.dataArray instanceof Array
         && typeof data["info"] === "object"
         && data["info"]["cubeName"];
@@ -140,13 +140,13 @@ DataController.prototype.resetRawData = function () {
 
     };
 
-    dim0raw(rd0, data.dimensions[0]);
-    dim1raw(rd1, data.dimensions[1]);
+    if (data.dimensions[0].length) dim0raw(rd0, data.dimensions[0]);
+    if (data.dimensions[1].length) dim1raw(rd1, data.dimensions[1]);
 
-    var xw = rd0[0].length,
-        yh = rd1.length,
-        xh = rd0.length,
-        yw = rd1[0].length;
+    var xw = (rd0[0] || []).length,
+        yh = rd1.length || data.info.rowCount || 0,
+        xh = rd0.length || data.info.colCount || 0,
+        yw = (rd1[0] || []).length;
 
     // render columns, rows and data
     for (var y = 0; y < xh + yh; y++) {
@@ -222,7 +222,9 @@ DataController.prototype.sortByColumn = function (columnIndex) {
     order = -order;
 
     newRawData.sort(function (a, b) {
-        return order*b[xIndex].value - order*a[xIndex].value;
+        if (b[xIndex].value > a[xIndex].value) return order;
+        if (b[xIndex].value < a[xIndex].value) return -order;
+        return 0;
     });
 
     data.rawData = data._rawDataOrigin.slice(0, data.info.topHeaderRowsNumber)
diff --git a/source/js/DataSource.js b/source/js/DataSource.js
@@ -13,6 +13,8 @@ var DataSource = function (config) {
 
     this.BASIC_MDX = config.basicMDX;
 
+    this.ACTION = config.action || "MDX";
+
 };
 
 /**
@@ -29,7 +31,7 @@ DataSource.prototype._post = function (url, data, callback) {
         if (xhr.readyState === 4 && xhr.status === 200) {
             callback((function () {
                 try {
-                    return JSON.parse(xhr.responseText)
+                    return JSON.parse(xhr.responseText) || {}
                 } catch (e) {
                     return {
                         error: "<h1>Unable to parse server response</h1><p>" + xhr.responseText
@@ -81,12 +83,57 @@ DataSource.prototype._convert = function (data) {
  */
 DataSource.prototype.getCurrentData = function (callback) {
 
-    var _ = this;
+    var _ = this,
+        __ = this._convert;
 
-    this._post(this.SOURCE_URL + "/MDX", {
+    this._post(this.SOURCE_URL + "/" + this.ACTION, {
         MDX: this.BASIC_MDX
     }, function (data) {
-        callback(_._convert(data));
+        (data.Info || {}).action = _.ACTION;
+        if (_.ACTION === "MDXDrillthrough") {
+            callback((function (data) {
+
+                var arr = data["children"] || [],
+                    headers = [],
+                    obj, i, u;
+
+                if (!arr.length) return {
+                    error: "No DrillThrough data."
+                };
+
+                for (i in arr[0]) {
+                    headers.push({ caption: i });
+                }
+
+                obj = {
+                    Cols: [ { tuples: headers }, { tuples: [] } ],
+                    Data: [],
+                    Info: {
+                        colCount: 8,
+                        cubeClass: "No cube class",
+                        cubeName: "No cube name",
+                        leftHeaderColumnsNumber: 0,
+                        rowCount: arr.length,
+                        topHeaderRowsNumber: headers.length,
+                        action: _.ACTION
+                    }
+                };
+
+                for (i in arr) {
+                    for (u in arr[i]) {
+                        obj.Data.push(arr[i][u]);
+                    }
+                }
+
+                return __(obj);
+
+            })(data));
+        } else if (_.ACTION = "MDX") {
+            callback(_._convert(data));
+        } else {
+            console.error("Not implemented URL action: " + _.ACTION);
+            callback({ error: "Not implemented URL action: " + data || true });
+        }
     });
 
 };
diff --git a/source/js/LightPivotTable.js b/source/js/LightPivotTable.js
@@ -73,7 +73,7 @@ LightPivotTable.prototype.tryDrillDown = function (filter) {
     var _ = this,
         ds = {};
 
-    // clone
+    // clone dataSource config object
     for (var i in _.CONFIG.dataSource) { ds[i] = _.CONFIG.dataSource[i]; }
     ds.basicMDX = this.mdxParser.drillDown(ds.basicMDX, filter) || ds.basicMDX;
 
@@ -91,6 +91,30 @@ LightPivotTable.prototype.tryDrillDown = function (filter) {
 
 };
 
+LightPivotTable.prototype.showDrillThrough = function () {
+
+    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;
+
+    this.pushDataSource(ds);
+
+    this.dataSource.getCurrentData(function (data) {
+        if (_.dataController.isValidData(data) && data.dataArray.length > 0) {
+            _.pivotView.pushTable();
+            _.dataController.pushData();
+            _.dataController.setData(data);
+        } else {
+            _.popDataSource();
+        }
+    });
+
+};
+
 LightPivotTable.prototype.init = function () {
 
     this.refresh();
diff --git a/source/js/MDXParser.js b/source/js/MDXParser.js
@@ -23,12 +23,39 @@ MDXParser.prototype.drillDown = function (basicMDX, filter) {
         oldPath[2] = clearFilter + ".children";
         parts[2] = oldPath.join("");
 
-        return "\n\n\n" + parts.join("") + " %FILTER " + filterParts.join("");
+        return parts.join("") + " %FILTER " + filterParts.join("");
 
     } catch (e) {
 
+        console.error("Unable to get DrillDown statement from", basicMDX, "with filter", filter);
         return "";
 
     }
 
 };
+
+/**
+ * Returns DrillThrough query for given MDX query.
+ *
+ * @param {string} basicMDX
+ * @returns {string}
+ */
+MDXParser.prototype.drillThrough = function (basicMDX) {
+
+    try {
+
+        var statement = ["DRILLTHROUGH SELECT "]
+            .concat(basicMDX.split(/(\s+ON\s+0,\s*)(.*)(\s+ON\s+1\s*)/).slice(2)).join("");
+
+        console.log("DRILLTHROUGH STATEMENT:", statement);
+
+        return statement === "DRILLTHROUGH SELECT " ? "" : statement;
+
+    } catch (e) {
+
+        console.error("Unable to get DrillThrough statement from", basicMDX);
+        return "";
+
+    }
+
+};
diff --git a/source/js/PivotView.js b/source/js/PivotView.js
@@ -141,6 +141,15 @@ PivotView.prototype._backClickHandler = function () {
 
 };
 
+PivotView.prototype._drillThroughClickHandler = function (event) {
+
+    this.controller.showDrillThrough();
+
+    event.cancelBubble = true;
+    event.stopPropagation();
+
+};
+
 PivotView.prototype.fixSizes = function (baseElement, elementToFix) {
 
     if (!elementToFix.style) return false;
@@ -304,6 +313,17 @@ PivotView.prototype.renderRawData = function (data) {
         headColsNum = 0, headLeftColsNum = 0,
         headRowsNum = 0, headLeftRowsNum = 0;
 
+    var addTrigger = function (element, event, trigger) {
+
+        element["triggerFunction"] = {
+            event: event,
+            trigger: trigger
+        };
+
+        element.addEventListener(event, trigger);
+
+    };
+
     // compute headColsNum & headLeftColsNum
     for (y = 0; y < data.length; y++) {
         for (x = 0; x < data[y].length; x++) {
@@ -357,13 +377,12 @@ PivotView.prototype.renderRawData = function (data) {
                     })(data[y][x].group);
 
                     if (x === 0 && y === 0 && _.tablesStack.length > 1) {
-                        td.className += " backButton";
-                        td.addEventListener("click", (td["triggerFunction"] = {
-                            trigger: function () {
-                                _._backClickHandler.call(_);
-                            },
-                            event: "click"
-                        }).trigger);
+                        var elt = document.createElement("div");
+                        elt.className = "backButton";
+                        addTrigger(elt, "click", function () {
+                            _._backClickHandler.call(_);
+                        });
+                        td.insertBefore(elt, td.childNodes[td.childNodes.length - 1] || null);
                     }
 
                 }
@@ -375,34 +394,40 @@ PivotView.prototype.renderRawData = function (data) {
             if (td && x >= headLeftColsNum && y === headColsNum - 1) {
                 // clickable cells (sort option)
                 (function (x) {
-                    td.addEventListener("click", (td["triggerFunction"] = {
-                        trigger: function () {
-                            var colNum = x - headLeftColsNum;
-                            _._columnClickHandler.call(_, colNum);
-                        },
-                        event: "click"
-                    }).trigger);
+                    addTrigger(td, "click", function () {
+                        var colNum = x - headLeftColsNum;
+                        _._columnClickHandler.call(_, colNum);
+                    });
                 })(x);
             }
 
             // add _rowClickHandler to th's last column
             if (td && x === headLeftColsNum - 1 && y >= headRowsNum) {
                 (function (y, x) {
-                    td.addEventListener("click", (td["triggerFunction"] = {
-                        trigger: function () {
-                            var rowNum = y - headRowsNum;
-                            _._rowClickHandler.call(_, rowNum, data[y][x]);
-                        },
-                        event: "click"
-                    }).trigger);
+                    addTrigger(td, "click", function () {
+                        var rowNum = y - headRowsNum;
+                        _._rowClickHandler.call(_, rowNum, data[y][x]);
+                    });
                 })(y, x);
             }
 
             if (td) {
-                td.textContent = data[y][x].value;
+                var span = document.createElement("span");
+                span.textContent = data[y][x].value;
+                td.appendChild(span);
+                //td.textContent = ;
                 tr.appendChild(td);
             }
 
+            if (x === 0 && y === 0 && _.controller.dataController.getData().info.action === "MDX") {
+                var element = document.createElement("div");
+                element.className = "drillDownIcon";
+                addTrigger(element, "click", function (event) {
+                    _._drillThroughClickHandler.call(_, event);
+                });
+                td.insertBefore(element, td.childNodes[td.childNodes.length - 1] || null);
+            }
+
         }
         (y < headColsNum ? thead : tbody).appendChild(tr);
     }
