formatting for headers apply - partly implemented

objectscript · Jun 26, 2015 · ee599c8 · ee599c8
1 parent b584705
commit ee599c8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {

diff --git a/source/js/DataController.js b/source/js/DataController.js
@@ -374,21 +374,25 @@ DataController.prototype.resetRawData = function () {
         if (!_.controller.CONFIG["pivotProperties"]) return rawData;
         var x, y, i, xEnd = rawData[0].length,
             colLevels = _.controller.getPivotProperty(["columnLevels"]),
+            rowLevels = _.controller.getPivotProperty(["rowLevels"]),
             formatColumn = {
                 // "<spec>": { style: "<style>" }
             };
         var fillLevels = function (obj) {
             if (typeof obj === "undefined") return;
             for (var i in obj["childLevels"]) {
-                if (obj["childLevels"][i]["spec"] && obj["childLevels"][i]["levelStyle"]) {
-                    formatColumn[obj["childLevels"][i]["spec"]] =
-                        { style: obj["childLevels"][i]["levelStyle"] };
+                if (obj["childLevels"][i] && obj["childLevels"][i]["spec"]) {
+                    formatColumn[(obj["childLevels"][i]["spec"] || "").replace(/[^.]*$/, "")] = {
+                        style: obj["childLevels"][i]["levelStyle"] || "",
+                        headStyle: obj["childLevels"][i]["levelHeaderStyle"] || ""
+                    };
                 }
                 fillLevels(obj["childLevels"][i]);
             }
         };
         for (i in colLevels) {
-            fillLevels(colLevels[i]);
+            fillLevels({ childLevels: [colLevels[i]] });
+            fillLevels({ childLevels: [rowLevels[i]] });
         }
         for (y = 0; y < rawData.length; y++) {
             for (x = 0; x < xEnd; x++) {
@@ -398,10 +402,14 @@ DataController.prototype.resetRawData = function () {
                 if (rawData[y][x].source && rawData[y][x].source["path"]) {
                     for (i in formatColumn) {
                         if (rawData[y][x].source["path"].indexOf(i) >= 0) {
-                            for (var yy = y + 1; yy < rawData.length; yy++) {
+                            var yy;
+                            for (yy = y; yy < rawData.length; yy++) {
                                 if (!rawData[yy][x].isCaption) {
-                                    rawData[yy][x].style = (rawData[yy][x].style || "")
+                                    if (formatColumn[i].style) rawData[yy][x].style = (rawData[yy][x].style || "")
                                         + formatColumn[i].style || "";
+                                } else {
+                                    if (formatColumn[i].headStyle) rawData[yy][x].style = (rawData[yy][x].style || "")
+                                        + formatColumn[i].headStyle || "";
                                 }
                             }
                             break;