temporary workaround for "avg" apply

nikitaeverywhere · Dec 22, 2014 · 52a28c0 · 52a28c0
1 parent 6e11c89
commit 52a28c0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/source/js/DataController.js b/source/js/DataController.js
@@ -286,12 +286,13 @@ 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: (countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
+                    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),
+                    // end
+                    //value: (countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
                     style: "font-weight: 900;"
                 }
             }

diff --git a/source/js/DataSource.js b/source/js/DataSource.js
@@ -156,20 +156,21 @@ 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]);
+        _.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
 
     };