@datarailsshared/dr_renderer 1.3.41 → 1.3.43

package/package.json

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

package/src/dr_pivottable.js

@@ -1,3 +1,6 @@
+const { DR_SCENARIO } = require('./smart_queries_helper');
+
+
 let initDRPivotTable = function($, window, document) {
     var hasProp = {}.hasOwnProperty;
     var slice = [].slice;
@@ -1269,6 +1272,9 @@ let initDRPivotTable = function($, window, document) {
                 "rowspan": rowHeader.descendants + 1,
                 "colspan": colspan
             });
+            if (opts.chartOptions.isSmartQueriesEnabled) {
+                th.textContent = th.textContent.replace(DR_SCENARIO.Forecast, 'Forecast Smart Query');
+            }
             if (opts.chartOptions.table_options.hide_nulls_in_headers) {
                 th.textContent = th.textContent.replace('[null]', '');
             }
@@ -1516,6 +1522,13 @@ let initDRPivotTable = function($, window, document) {
                         }
                     };
                     val = aggregator.value();
+
+                    if (opts.chartOptions.isSmartQueriesEnabled && flatRowKey.split(' , ').includes(DR_SCENARIO.Forecast)) {
+                        const actualsRow = tree[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)] || {};
+                        if (actualsRow && actualsRow[flatColKey]) {
+                            val += actualsRow[flatColKey]?.value() || 0;
+                        }
+                    }
                     isColSubtotal = colHeader.children.length !== 0;
                     style = "pvtVal";
                     if (isColSubtotal) {
@@ -1558,6 +1571,9 @@ let initDRPivotTable = function($, window, document) {
                 }
 
                 val = totalAggregator.value();
+                if (opts.chartOptions.isSmartQueriesEnabled && flatRowKey.split(' , ').includes(DR_SCENARIO.Forecast)) {
+                    val += rowTotals[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)]?.value() || 0;
+                }
                 style = "pvtTotal rowTotal";
                 if (isRowSubtotal) {
                     style += " pvtRowSubtotal";
@@ -2338,6 +2354,9 @@ let initDRPivotTable = function($, window, document) {
         }
 
         main = function(rowAttrs, rowKeys, colAttrs, colKeys, pivotData) {
+            if (opts.chartOptions.isSmartQueriesEnabled) {
+                rowKeys = rowKeys.filter(rowKey => !rowKey.includes(DR_SCENARIO.SQ_Actuals));
+            }
             var c,rowspan, colHeaderCols, colHeaderHeaders, colHeaders, h, k, l, len, len1, result, rowHeaderHeaders, rowHeaderRows, rowHeaders, tbody, thead, tr;
             rowHeaders = [];
             colHeaders = [];

package/src/highcharts_renderer.js

@@ -2104,8 +2104,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             opposite: true,
             tickPositioner: function () {
                 const primaryAxisTicksCount = this.chart.yAxis[0].tickPositions.length;
-                const minFromSettings = parseInt(lodash.get(opts, 'comboOptions.secondaryAxisSettings.min'));
-                const maxFromSettings = parseInt(lodash.get(opts, 'comboOptions.secondaryAxisSettings.max'));
+                const minFromSettings = parseFloat(lodash.get(opts, 'comboOptions.secondaryAxisSettings.min'));
+                const maxFromSettings = parseFloat(lodash.get(opts, 'comboOptions.secondaryAxisSettings.max'));
                 let secondaryAxisMin = !isNaN(minFromSettings) ? minFromSettings : this.tickPositions[0];
                 let secondaryAxisMax = !isNaN(maxFromSettings) ? maxFromSettings : this.tickPositions[this.tickPositions.length - 1];
 

package/src/smart_queries_helper.js

@@ -1,10 +1,16 @@
 const lodash = require('lodash');
 
+const DR_SCENARIO = {
+    SQ_Actuals: 'SQ_Actuals',
+    Forecast: 'Forecast',
+};
+
 function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData) {
   const { actuals, forecast, smart_query } = chartOptions.chart;
   const input = pivotData.input;
 
-  const hasSQActuals = input.some(item => item.Scenario && item.Scenario.indexOf('SQ_Actuals') !== -1);
+  const hasSQActuals = input.some(item => item.Scenario && item.Scenario.indexOf(DR_SCENARIO.SQ_Actuals) !== -1);
+  chartOptions.isSmartQueriesEnabled = hasSQActuals;
   if (!smart_query || !hasSQActuals) return null;
 
   const midMonthOffset = 0.5
@@ -15,7 +21,7 @@ function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData
 
 function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset) {
   const filtered = input.filter(item =>
-    (item.Scenario === 'SQ_Actuals' || item.Scenario === 'Forecast') &&
+    (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) &&
     item.Amount !== 0
   );
 
@@ -26,7 +32,7 @@ function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOf
     type: item.Scenario,
   })).sort((a, b) => new Date(a.name) - new Date(b.name));
 
-  const sqCount = input.filter(item => item.Scenario === 'SQ_Actuals').length;
+  const sqCount = input.filter(item => item.Scenario === DR_SCENARIO.SQ_Actuals).length;
 
   return {
     name: "Forecast Smart Query",
@@ -40,8 +46,8 @@ function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOf
 }
 
 function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset) {
-  const seriesA = lodash.find(chart_series, s => s.name && lodash.includes(s.name, 'SQ_Actuals'));
-  const seriesB = lodash.find(chart_series, s => s.name && lodash.includes(s.name, 'Forecast'));
+  const seriesA = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.SQ_Actuals));
+  const seriesB = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.Forecast));
 
   if (!seriesA || !seriesB) return null;
 
@@ -69,7 +75,7 @@ function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOff
       y: yA + yB,
       name: pointA && pointA.name ? pointA.name : null,
       initialName: (pointA && pointA.name) ? pointA.name : 'Point ' + (i + 1),
-      type: yA ? "SQ_Actuals" : "Forecast",
+      type: yA ? DR_SCENARIO.SQ_Actuals : DR_SCENARIO.Forecast,
     });
   }
 
@@ -86,4 +92,5 @@ function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOff
 
 module.exports = {
   createSingleDataSeriesForForecast,
+  DR_SCENARIO
 };