@datarailsshared/dr_renderer 1.2.155-dragons → 1.2.157-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -7581,6 +7581,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let filters = [];
+
+        this.formatDatesWithAggregationIfRequired(widget, null);
+        
         lodash.forEach(col_key, function (col_value, index) {
             if (widget && widget.cols[index]) {
                 let temp = highchartsRenderer.createFilterObject(widget.cols[index]);
@@ -7783,10 +7786,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         datesFields = lodash.filter(widget.rows, element => element.type == 'Date');
         datesFields = datesFields.concat(lodash.filter(widget.cols, element => element.type == 'Date'));
 
-        const aggregationConfigs = widget.options ? widget.options.date_aggregation_configs || [] : [];
-        if (aggregationConfigs.length && datesFields && datesFields.length) {
-            highchartsRenderer.formatDatesWithAggregationIfRequired(aggregationConfigs, datesFields, defaultDateFormat);
-        }
+        highchartsRenderer.formatDatesWithAggregationIfRequired(widget, defaultDateFormat);
 
         const isCustomSorting = widget.options.sortingFields && Array.isArray(widget.options.sortingFields) && widget.options.sortingFields.length > 0;
         if (isCustomSorting) {
@@ -8216,21 +8216,29 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         yAxis.max = !isNaN(maxNumber) ? maxNumber : null;
     }
 
-    highchartsRenderer.formatDatesWithAggregationIfRequired = function(aggregationConfigs, datesFields, defaultDateFormat) {
-        _.forEach(aggregationConfigs, aggregationConfig => {
-            const aggregationTimeframe = aggregationConfig ? aggregationConfig.aggregate_by : null;
-            const isFormattingByAggregation = aggregationConfig ? aggregationConfig.is_formatting_by_aggregation_method : false;
+    highchartsRenderer.formatDatesWithAggregationIfRequired = function(widget, defaultDateFormat) {
+
+        let datesFields = [];
+        datesFields = lodash.filter(widget.rows, element => element.type == 'Date');
+        datesFields = datesFields.concat(lodash.filter(widget.cols, element => element.type == 'Date'));
+        const aggregationConfigs = widget.options ? widget.options.date_aggregation_configs || [] : [];
 
-            if (aggregationTimeframe && isFormattingByAggregation) {
-                const dateField = lodash.find(
-                    datesFields,
-                    (element) => element.id === aggregationConfig.field_id
-                );
-                if (dateField) {
-                    dateField.format = highchartsRenderer.getDateFormatByAggregation(aggregationTimeframe, defaultDateFormat);
+        if (aggregationConfigs.length && datesFields && datesFields.length) {
+            _.forEach(aggregationConfigs, aggregationConfig => {
+                const aggregationTimeframe = aggregationConfig ? aggregationConfig.aggregate_by : null;
+                const isFormattingByAggregation = aggregationConfig ? aggregationConfig.is_formatting_by_aggregation_method : false;
+    
+                if (aggregationTimeframe && isFormattingByAggregation) {
+                    const dateField = lodash.find(
+                        datesFields,
+                        (element) => element.id === aggregationConfig.field_id
+                    );
+                    if (dateField) {
+                        dateField.format = highchartsRenderer.getDateFormatByAggregation(aggregationTimeframe, defaultDateFormat);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     highchartsRenderer.getDateFormatByAggregation = function(timeframe, defaultDateFormat) {