correct totals and number formatting

Author: nikitaeverywhere

source/js/DataController.js

@@ -87,13 +87,50 @@ DataController.prototype.setData = function (data) {
 
     this._dataStack[this._dataStack.length - 1].data = data;
     //this.data = data;
+    this.resetDimensionProps();
     this.resetRawData();
 
     this._trigger();
     return data;
 
 };
 
+/**
+ * Sets properties of rows/columns.
+ *
+ * @returns {null}
+ */
+DataController.prototype.resetDimensionProps = function () {
+
+    var data, columnProps = [];
+
+    if (!(data = this._dataStack[this._dataStack.length - 1].data)) {
+        console.error("Unable to get dimension props for given data set.");
+        return null;
+    }
+
+    var parse = function (obj, props) {
+        var tObj;
+        if (obj["children"] && obj["children"].length > 0) {
+            for (var i in obj.children) {
+                tObj = obj.children[i];
+                if (tObj["format"]) props["format"] = tObj["format"];
+                if (tObj["style"]) props["style"] = (props["style"] || "") + tObj["style"];
+                if (tObj["total"]) props["total"] = tObj["total"];
+                if (tObj["type"]) props["type"] = tObj["type"];
+                parse(tObj, props);
+            }
+        } else {
+            columnProps.push(props);
+        }
+    };
+
+    parse({ children: data.dimensions[0] }, {});
+
+    data.columnProps = columnProps;
+
+};
+
 /**
  * Renders table data (pseudo-table object) from data retrieved from MDX2JSON source.
  *
@@ -262,7 +299,7 @@ DataController.prototype.resetRawData = function () {
     this.SUMMARY_SHOWN = false;
     this._dataStack[this._dataStack.length - 1].SUMMARY_SHOWN = false;
 
-    var countSummaryByColumn = function (array, iStart, iEnd, column) {
+    var totalSUM = function (array, iStart, iEnd, column) {
         var sum = 0;
         for (var i = iStart; i < iEnd; i++) {
             if (!isFinite(array[i][column]["value"])) {
@@ -274,7 +311,7 @@ DataController.prototype.resetRawData = function () {
         return sum || "";
     };
 
-    var countAverageByColumn = function (array, iStart, iEnd, column) {
+    var totalAVG = function (array, iStart, iEnd, column) {
         var sum = 0;
         for (var i = iStart; i < iEnd; i++) {
             if (!isFinite(array[i][column]["value"])) {
@@ -286,6 +323,18 @@ DataController.prototype.resetRawData = function () {
         return sum/(iEnd - iStart) || "";
     };
 
+    /**
+     * @param {number} columnIndex
+     * @returns {Function}
+     */
+    var getTotalFunction = function (columnIndex) {
+        if (!data["columnProps"][columnIndex]) return totalSUM;
+        switch (data["columnProps"][columnIndex].total) {
+            case "AVG": return totalAVG;
+            default: return totalSUM;
+        }
+    };
+
     if (this.controller.CONFIG["showSummary"] && rawData.length - xh > 1 // xh - see above
         && (rawData[rawData.length - 1][0] || {})["isCaption"]) {
         this.SUMMARY_SHOWN = true;
@@ -303,11 +352,9 @@ DataController.prototype.resetRawData = function () {
             } else {
                 summary[i] = {
                     // very hard workaround (applying "avg" last column spec)
-                    value: ((rawData[x].length - 1 === parseInt(i)
-                            && _.controller.CONFIG["_temp_lastColSpec"]
-                            && _.controller.CONFIG["_temp_lastColSpec"]["levelSummary"] === "avg")
-                                ? countAverageByColumn
-                                : countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
+                    value:
+                        getTotalFunction(parseInt(i) - data.info.leftHeaderColumnsNumber)
+                            (rawData, xh, rawData.length - 1, i),
                     // end
                     //value: (countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
                     style: "font-weight: bold;"

source/js/DataSource.js

@@ -155,23 +155,6 @@ DataSource.prototype.getCurrentData = function (callback) {
             }
         }
 
-        // temporary hard workaround (getting last column specs)
-        _.GLOBAL_CONFIG["_temp_lastColSpec"] = (function (lev) {
-            var tc = lev,
-                f = function (lev) {
-                    if (lev["childLevels"] && lev["childLevels"].length > 0) {
-                        for (var i in lev["childLevels"]) {
-                            f(lev["childLevels"][i]);
-                        }
-                    } else {
-                        tc = lev;
-                    }
-                };
-            if (lev) f(lev);
-            return tc;
-        })(data["columnLevels"][data["columnLevels"].length - 1]);
-        // end
-
     };
 
     var handleDataReady = function () {

source/js/PivotView.js

@@ -511,6 +511,7 @@ PivotView.prototype.renderRawData = function (data) {
         renderedGroups = {}, // keys of rendered groups; key = group, value = { x, y, element }
         rawData = data["rawData"],
         info = data["info"],
+        columnProps = data["columnProps"],
         container = this.elements.tableContainer,
         pivotTopSection = document.createElement("div"),
         pivotBottomSection = document.createElement("div"),
@@ -632,8 +633,19 @@ PivotView.prototype.renderRawData = function (data) {
         for (x = info.leftHeaderColumnsNumber; x < rawData[0].length; x++) {
 
             tr.appendChild(td = document.createElement("td"));
-            if (!isFinite(rawData[y][x].value)) td.className += " formatLeft";
-            td.textContent = rawData[y][x].value || "";
+            if (!isFinite(rawData[y][x].value)) {
+                td.className += " formatLeft";
+                td.textContent = rawData[y][x].value || "";
+            } else { // number
+                if (columnProps[x - info.leftHeaderColumnsNumber].format) {
+                    td.textContent = this.formatNumber(
+                        columnProps[x - info.leftHeaderColumnsNumber].format,
+                        rawData[y][x].value || 0
+                    ) || "";
+                } else {
+                    td.textContent = rawData[y][x].value || "";
+                }
+            }
             if (rawData[y][x].style) td.setAttribute("style", rawData[y][x].style);
 
             // add handlers