@datarailsshared/dr_renderer 1.3.40 → 1.3.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.3.40",
+  "version": "1.3.42",
   "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

@@ -1420,14 +1420,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         
         const chartType = chartOptions && chartOptions.chart && chartOptions.chart.type ? chartOptions.chart.type : null;
         const smartQuerySeries = isChartTypeSupportedForSmartQuery(chartType)
-            ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions)
+            ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions, pivotData)
             : null;
 
         if (smartQuerySeries) {
-            chart_series.push(smartQuerySeries);
-            lodash.remove(chart_series, s => 
+            if (chart_series.length > 1) {
+                lodash.remove(chart_series, s => 
                 (s.name && lodash.includes(s.name, 'SQ_Actuals')) || s.name === 'Forecast'
-            );
+                );
+            } else {
+                chart_series = []
+            }
+            chart_series.push(smartQuerySeries);
         }
 
         return chart_series;
@@ -9913,9 +9917,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const initialNameForSmartQueries = seriesData 
             ? lodash.find(seriesData, obj => obj.name === e.point.name)
             : null;
-        
         if (initialNameForSmartQueries && initialNameForSmartQueries.type) {
-            e.point.series.name = initialNameForSmartQueries.type;
+            e.point.series.name = initialNameForSmartQueries.type === "SQ_Actuals" ? 'Actuals' : 'Forecast';
         }
         lodash.set(e, 'point.category.userOptions', e.point.initialName.toString().split(highchartsRenderer.delimer));
     }

package/src/smart_queries_helper.js

@@ -1,16 +1,55 @@
 const lodash = require('lodash');
 
-function createSingleDataSeriesForForecast(chart_series, chartOptions) {
+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 seriesA = lodash.find(chart_series, function(s) {
-    return s.name && lodash.includes(s.name, 'SQ_Actuals');
-  });
-  const seriesB = lodash.find(chart_series, function(s) {
-    return s.name && lodash.includes(s.name, 'Forecast');
-  });
+  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
+  return chart_series.length === 1
+    ? buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset)
+    : buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset);
+}
+
+function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset) {
+  const filtered = input.filter(item =>
+    (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) &&
+    item.Amount !== 0
+  );
+
+  const data = filtered.map(item => ({
+    y: item.Amount,
+    name: item.Reporting_Month,
+    initialName: item.Reporting_Month,
+    type: item.Scenario,
+  })).sort((a, b) => new Date(a.name) - new Date(b.name));
 
-  if (!seriesA || !seriesB || !smart_query) return null;
+  const sqCount = input.filter(item => item.Scenario === DR_SCENARIO.SQ_Actuals).length;
+
+  return {
+    name: "Forecast Smart Query",
+    data,
+    zoneAxis: "x",
+    zones: [
+      { value: sqCount - midMonthOffset, dashStyle: actuals },
+      { dashStyle: forecast },
+    ],
+  };
+}
+
+function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset) {
+  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;
 
   const indexOfForecastFirstZero = lodash.findIndex(seriesB.data, function(value) {
     return value.y === 0;
@@ -20,17 +59,9 @@ function createSingleDataSeriesForForecast(chart_series, chartOptions) {
   });
   const cutoffIndex = Math.max(indexOfForecastFirstZero, indexOfActualsFirstZero);
 
-  const derivedSeries = {
-    name: "Forecast Smart Query",
-    data: [],
-    zoneAxis: "x",
-    zones: [
-      { value: cutoffIndex - 1, dashStyle: actuals },
-      { dashStyle: forecast },
-    ],
-  };
 
   const minLength = Math.min(seriesA.data.length, seriesB.data.length);
+  const data = [];
 
   for (let i = 0; i < minLength; i++) {
     const pointA = seriesA.data[i];
@@ -39,19 +70,27 @@ function createSingleDataSeriesForForecast(chart_series, chartOptions) {
     const yA = (pointA && pointA.y !== null && typeof pointA.y !== undefined) ? pointA.y : pointA;
     const yB = (pointB && pointB.y !== null && typeof pointB.y !== undefined) ? pointB.y : pointB;
 
-    derivedSeries.data.push({
+    data.push({
       x: i,
-      y: yA || yB,
+      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,
     });
   }
 
-  return derivedSeries;
+  return {
+    name: "Forecast Smart Query",
+    data,
+    zoneAxis: "x",
+    zones: [
+      { value: cutoffIndex - midMonthOffset, dashStyle: actuals },
+      { dashStyle: forecast },
+    ],
+  };
 }
 
-
 module.exports = {
   createSingleDataSeriesForForecast,
+  DR_SCENARIO
 };