@datarailsshared/dr_renderer 1.2.67 → 1.2.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.67",
+  "version": "1.2.71",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr_pivottable.js

@@ -127,10 +127,10 @@ let initDRPivotTable = function($, window, document) {
                 }
 
                 if (containsAverage || containsOthers) {
-                    if (containsAverage && key[0] === 'DR_Average') {
+                    if (containsAverage && !containsOthers && key[0] === 'DR_Average') {
                         totals[flatKey].push(record);
                     }
-                    if (containsOthers && key[0] === 'DR_Others') {
+                    if (containsOthers && !containsAverage && key[0] === 'DR_Others') {
                         totals[flatKey].push(record);
                     }
                 } else {
@@ -487,7 +487,7 @@ let initDRPivotTable = function($, window, document) {
         var createTotalValsBolder, createGrandTotalBolder, getHeaderColorProperties, colorizeRowLabelHeaders, colorizeTableIfNeed, valueNoDashes, getColorsWithOffsetForTable, offsetColors, handleFreezePanesScroll, selectFreezableElements, removeRowHeaderNullValue;
         var getAdditionalAggregation, buildAdditionalHeaderCols, buildAdditionalHeaderRows, buildAdditionalColValues, buildAdditionalRowValues, buildAdditionalRowTotals, buildAdditionalColTotals;
         var additionalFieldsCol, additionalFieldsRow, additionalFieldsList;
-        var edit_assumptions;
+        var edit_assumptions, getExistingAggregator;
 
         var horizontalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' horizontal-freeze-pane' : '';
         var verticalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' vertical-freeze-pane' : '';
@@ -1355,14 +1355,11 @@ let initDRPivotTable = function($, window, document) {
         }
 
         buildAdditionalRowValues = function (tr, colHeaderCols, rowKey) {
-            let totalRowValue = 0;
-
             for (let i = 0; i < colHeaderCols.length; i++) {
                 const colKey = colHeaderCols[i].flatKey;
                 const totalAggregator = getAdditionalAggregation(rowKey, colKey);
                 const val = totalAggregator.value();
                 const formattedValue = getFormattedNumber(val, totalAggregator, opts)
-                totalRowValue += +formattedValue;
 
                 let className = " col" + i + " colcol" + 0;
                 const td = createElement("td", className, formattedValue, {
@@ -1374,46 +1371,73 @@ let initDRPivotTable = function($, window, document) {
                 tr.appendChild(td);
             }
 
+            if (additionalFieldsCol.length) {
+                for (let i = 0; i < additionalFieldsCol.length; i++) {
+                    const totalAggregator = getAdditionalAggregation(rowKey, additionalFieldsCol[i].key);
+                    const val = totalAggregator.value();
+                    const formattedValue = getFormattedNumber(val, totalAggregator, opts)
+
+                    let className = " col" + i + " colcol" + 0;
+                    const td = createElement("td", className, formattedValue, {
+                        "data-value": val,
+                        "data-for": "col" + 0,
+                        "data-colnode": "" + i
+                    });
+
+                    tr.appendChild(td);
+                }
+            }
+
             if(opts.chartOptions.table_options.show_row_total) {
-                buildAdditionalRowTotals(tr, totalRowValue)
+                buildAdditionalRowTotals(tr, rowKey)
             }
         }
 
-        buildAdditionalRowTotals = function (tr, totalRowValue) {
-            let style = "pvtTotal pvtAddFiled rowTotal";
+        buildAdditionalRowTotals = function (tr, rowKey) {
+            const totalAggregator = getExistingAggregator(rowTotals, rowKey);
+            const value = totalAggregator.value();
+            const formattedValue = getFormattedNumber(value, totalAggregator, opts)
 
-            const td = createElement("td", style, totalRowValue, {
-                "data-value": totalRowValue
+            let style = "pvtTotal pvtAddFiled rowTotal";
+            const td = createElement("td", style, formattedValue, {
+                "data-value": value
             });
 
             tr.appendChild(td);
         }
 
         buildAdditionalColTotals = function (tr, rowHeaderRows, colKey, colHeader) {
-            let othersVal = 0;
-            let val;
-
-            for (let i = 0; i < rowHeaderRows.length; i++) {
-                const rowKey = rowHeaderRows[i].flatKey;
-                const totalAggregator = getAdditionalAggregation(rowKey, colKey);
-                val = totalAggregator.value();
-
-                othersVal += +getFormattedNumber(val, totalAggregator, opts);
-            }
+            const totalAggregator = getExistingAggregator(colTotals, colKey)
+            const value = totalAggregator.value();
+            const formattedValue = getFormattedNumber(value, totalAggregator, opts);
 
             let style = "pvtTotal pvtAddField colTotal";
             style += " col" + colHeader.row + " colcol" + colHeader.col;
 
-            const td = createElement("td", style, othersVal, {
-                "data-value": othersVal,
+            const td = createElement("td", style, formattedValue, {
+                "data-value": value,
                 "data-rowcol": "col" + colHeader.col,
                 "data-rownode": "" + colHeader.node
-            }, getTableEventHandlers(othersVal, [], colHeader.key));
-
+            }, getTableEventHandlers(value, [], colHeader.key));
 
             return td;
         }
 
+        getExistingAggregator = function (aggregator, key) {
+            if (!aggregator[key]) {
+                return {
+                    value: (function () {
+                        return null;
+                    }),
+                    format: function () {
+                        return "";
+                    }
+                };
+            }
+
+            return aggregator[key];
+        }
+
         buildValues = function(rowHeaderRows, colHeaderCols, rowAttrs, colAttrs) {
             var aggregator, colHeader, eventHandlers, flatColKey, flatRowKey, isColSubtotal, isRowSubtotal, k, l, len, len1, ref8, results, rowHeader, style, td, totalAggregator, tr, val;
 

package/src/highcharts_renderer.js

@@ -917,6 +917,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
         const trendSerieses = [];
+        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             var ob = {};
@@ -925,7 +926,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             let squareXSum = 0;
             ob.data = [];
             if (row_n_value && row_n_value.length > 0) {
-                let othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
                 ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
             }
 
@@ -933,6 +933,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
 
+                if (col_n_value[0] === 'DR_Others') {
+                    col_n_value[0] = othersName;
+                }
+
                 if (isUniqueVals && agg.uniq)
                     val = agg.uniq.join('<br>');
 
@@ -1059,6 +1063,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
         const trendSerieses = [];
+        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             let ySum = 0;
@@ -1067,7 +1072,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var ob = {};
             ob.data = [];
             if (row_n_value && row_n_value.length > 0) {
-                let othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
                 ob.name = lodash.unescape(row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName));
             }
 
@@ -1105,6 +1109,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
                 tmoobj.name = lodash.unescape(key);
 
+                if (tmoobj.name) {
+                    tmoobj.name = tmoobj.name.replace('DR_Others', othersName);
+                }
+
                 if (lodash.isEmpty(String(tmoobj.name))) {
                     tmoobj.name = "[blank]";
                 }
@@ -2007,7 +2015,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.setTitleAndSubTitle = function (chartOptions, opts, additionOptions) {
-        chartOptions.title = opts.chartOptions.hideChartHeader ? { text: '' } : {
+        chartOptions.title = opts.chartOptions.hideChartHeader ? null : {
             align: 'center',
             text: opts && opts.chart_title ? opts.chart_title : "",
             style: {