Per-row formatting support

Author: nikitaeverywhere

package.json

@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.6.12",
+  "version": "1.7.0",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {

source/js/DataController.js

@@ -142,23 +142,23 @@ DataController.prototype.setDrillThroughHandler = function (handler) {
  */
 DataController.prototype.resetDimensionProps = function () {
 
-    var data, columnProps;
+    var data, columnProps, rowProps;
 
     if (!(data = this._dataStack[this._dataStack.length - 1].data)) {
         console.error("Unable to get dimension props for given data set.");
         return;
     }
 
-    columnProps = new Array(data.info.leftHeaderColumnsNumber || 0); // fill left headers as empty
-    for (var i = 0; i < columnProps.length; i++) { columnProps[i] = {}; }
+    columnProps = []; // fill left headers as empty
+    rowProps = []; // fill left headers as empty
 
     var cloneObj = function (obj) {
         var i, newObj = {};
         for (i in obj) newObj[i] = obj[i];
         return newObj;
     };
 
-    var parse = function (obj, props) {
+    var parse = function (dimProps, obj, props) {
         var tObj, clonedProps, i;
         if (obj["children"] && obj["children"].length > 0) {
             for (i in obj.children) {
@@ -172,16 +172,18 @@ DataController.prototype.resetDimensionProps = function () {
                 if (tObj["total"]) clonedProps["summary"]
                     = (tObj["total"] || "").toLowerCase().replace(/:.*/, ""); // what is "max:Days"?
                 if (tObj["type"]) clonedProps["type"] = tObj["type"];
-                parse(tObj, clonedProps);
+                parse(dimProps, tObj, clonedProps);
             }
         } else {
-            columnProps.push(cloneObj(props));
+            dimProps.push(cloneObj(props));
         }
     };
 
-    parse({ children: data.dimensions[0] }, {});
+    parse(columnProps, { children: data.dimensions[0] }, {});
+    parse(rowProps, { children: data.dimensions[1] }, {});
 
     data.columnProps = columnProps;
+    data.rowProps = rowProps;
 
 };
 
@@ -474,12 +476,15 @@ DataController.prototype.resetRawData = function () {
             rowLevels = _.controller.getPivotProperty(["rowLevels"]),
             formatColumn = {
                 // "<spec>": { style: "<style>" }
+            },
+            formatRow = {
+                // "<spec>": { style: "<style>" } // unused
             };
-        var fillLevels = function (obj) {
+        var fillLevels = function (temp, obj) {
             if (typeof obj === "undefined") return;
             for (var i in obj["childLevels"]) {
                 if (obj["childLevels"][i] && obj["childLevels"][i]["spec"]) {
-                    formatColumn[(obj["childLevels"][i]["spec"] || "").replace(/[^.]*$/, "")] = {
+                    temp[(obj["childLevels"][i]["spec"] || "").replace(/[^.]*$/, "")] = {
                         style: obj["childLevels"][i]["levelStyle"] || "",
                         headStyle: obj["childLevels"][i]["levelHeaderStyle"] || ""
                     };
@@ -488,8 +493,8 @@ DataController.prototype.resetRawData = function () {
             }
         };
         for (i in colLevels) {
-            fillLevels({ childLevels: [colLevels[i]] });
-            fillLevels({ childLevels: [rowLevels[i]] });
+            fillLevels(formatColumn, { childLevels: [colLevels[i]] });
+            fillLevels(formatRow, { childLevels: [rowLevels[i]] });
         }
         for (y = 0; y < rawData.length; y++) {
             for (x = 0; x < xEnd; x++) {
@@ -569,6 +574,9 @@ DataController.prototype.resetRawData = function () {
     this.SUMMARY_SHOWN = false;
     this._dataStack[this._dataStack.length - 1].SUMMARY_SHOWN = false;
 
+    for (i = 0; i < data.info.leftHeaderColumnsNumber; i++) { data.columnProps.unshift({}); }
+    for (i = 0; i < data.info.topHeaderRowsNumber; i++) { data.rowProps.unshift({}); }
+
     /**
      * @param {number} columnIndex
      * @returns {Function}

source/js/PivotView.js

@@ -1033,6 +1033,7 @@ PivotView.prototype.renderRawData = function (data) {
         rawData = data["rawData"],
         info = data["info"],
         columnProps = data["columnProps"],
+        rowProps = data["rowProps"],
         colorScale =
             data["conditionalFormatting"] ? data["conditionalFormatting"]["colorScale"] : undefined,
 
@@ -1106,7 +1107,7 @@ PivotView.prototype.renderRawData = function (data) {
                     + p + "</a>";
             });
         } else if (!LISTING) { // number
-            if (format === "%date%") { // Cach? internal date
+            if (format === "%date%") { // Caché internal date
                 var d = new Date(_.getUnixDateFromCacheFormat(value));
                 if (isNaN(d.getTime())) { element.textContent = value; return; }
                 element.textContent = d.getHours() + d.getMinutes() + d.getSeconds() === 0
@@ -1283,7 +1284,7 @@ PivotView.prototype.renderRawData = function (data) {
                     if (!rawData[y][x].isCaption) formatContent(
                         rawData[y][x].value,
                         th,
-                        columnProps[x].format
+                        rowProps[y].format || columnProps[x].format
                     );
                 }
 
@@ -1379,7 +1380,7 @@ PivotView.prototype.renderRawData = function (data) {
             formatContent(
                 rawData[y][x].value,
                 div,
-                columnProps[x].format
+                (rowProps[y] && rowProps[y].format) || columnProps[x].format
             );
             if (
                 colorScale
@@ -1392,8 +1393,9 @@ PivotView.prototype.renderRawData = function (data) {
                 + "," + Math.round((colorScale.to.b - colorScale.from.b)*ratio + colorScale.from.b)
                 + ");" + (colorScale.invert ? "color: white;" : "");
             }
-            if (columnProps[x].style) {
-                cellStyle += columnProps[x].style;
+            if (columnProps[x].style || (rowProps[y] && rowProps[y].style)) {
+                cellStyle += ((rowProps[y] && rowProps[y].style) || "") +
+                    ((rowProps[y] && rowProps[y].style) ? " " : "") + (columnProps[x].style || "");
             }
             if (rawData[y][x].style) {
                 cellStyle += rawData[y][x].style;