@datarailsshared/dr_renderer 1.2.160-dragons → 1.2.162

package/package.json

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

package/src/highcharts_renderer.js

@@ -7581,14 +7581,16 @@ 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]);
                 if (widget.cols[index].type === 'Date') {
-                    let datetrange = highchartsRenderer.createDateTypeFromValue(col_value, widget.cols[index].format);
+                    let datetrange = highchartsRenderer.createDateTypeFromValue(
+                        col_value,
+                        highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
+                    );
+
                     if ($.isEmptyObject(datetrange)) {
                         return;
                     }
@@ -7606,7 +7608,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 let temp = highchartsRenderer.createFilterObject(widget.rows[index]);
 
                 if (widget.rows[index].type === 'Date') {
-                    let datetrange = highchartsRenderer.createDateTypeFromValue(row_value, widget.rows[index].format);
+                    let datetrange = highchartsRenderer.createDateTypeFromValue(
+                        row_value,
+                        highchartsRenderer.getDateFieldFormat(widget, widget.rows[index])
+                    );
+
                     if ($.isEmptyObject(datetrange)) {
                         return;
                     }
@@ -7672,10 +7678,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (filter) {
                 filter.is_excluded = false;
                 filter.values = widget.rows[i].type === 'Date' ?
-                    highchartsRenderer.createDateTypeFromValue(rowKey[i], widget.rows[i].format) :
+                    highchartsRenderer.createDateTypeFromValue(rowKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.rows[i])) :
                     [rowKey[i]];
             } else {
-                filters.push(highchartsRenderer.createDrillDownFilterObject(widget.rows[i], rowKey[i]))
+                filters.push(highchartsRenderer.createDrillDownFilterObject(widget, widget.rows[i], rowKey[i]))
             }
         }
         for (let i = 0; i < colKey.length; i++) {
@@ -7683,16 +7689,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (filter) {
                 filter.is_excluded = false;
                 filter.values = widget.cols[i].type === 'Date' ?
-                    highchartsRenderer.createDateTypeFromValue(colKey[i], widget.cols[i].format) :
+                    highchartsRenderer.createDateTypeFromValue(colKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.cols[i])) :
                     [colKey[i]];
             } else {
-                filters.push(highchartsRenderer.createDrillDownFilterObject(widget.cols[i], colKey[i]))
+                filters.push(highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[i], colKey[i]))
             }
         }
         return filters;
     };
 
-    highchartsRenderer.createDrillDownFilterObject = function (field, value) {
+    highchartsRenderer.createDrillDownFilterObject = function (widget, field, value) {
         var filtOb = {};
 
         filtOb.is_excluded = false;
@@ -7703,7 +7709,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         filtOb.field = field.id;
         filtOb.name = highchartsRenderer.decodeFunc(field.name);
         if (field.type === 'Date') {
-            filtOb.values = highchartsRenderer.createDateTypeFromValue(value, field.format);
+            filtOb.values = highchartsRenderer.createDateTypeFromValue(value, highchartsRenderer.getDateFieldFormat(widget, field));
         }
 
         return filtOb;
@@ -7786,8 +7792,6 @@ 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'));
 
-        highchartsRenderer.formatDatesWithAggregationIfRequired(widget, defaultDateFormat);
-
         const isCustomSorting = widget.options.sortingFields && Array.isArray(widget.options.sortingFields) && widget.options.sortingFields.length > 0;
         if (isCustomSorting) {
             lodash.forEach(datesFields, function (field) {
@@ -7797,7 +7801,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         datesFields = lodash.map(datesFields, function (row) {
-            return {"format": row.format, "name": row.name, "type": row.type, "values": [], "sorting": row.sorting} //'MMM - yyyy' format
+            return { "format": highchartsRenderer.getDateFieldFormat(widget, row), "name": row.name, "type": row.type, "values": [], "sorting": row.sorting } //'MMM - yyyy' format
         });
 
         var data = res;
@@ -8216,32 +8220,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         yAxis.max = !isNaN(maxNumber) ? maxNumber : null;
     }
 
-    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 || [] : [];
+    highchartsRenderer.getDateFieldFormat = function(widget, dateField) {
+        const aggregationConfig = widget.options && widget.options.date_aggregation_configs 
+            ? _.find(widget.options.date_aggregation_configs, { field_id: dateField.id })
+            : null;
 
-        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);
-                    }
-                }
-            });
+        if (aggregationConfig && aggregationConfig.aggregate_by && aggregationConfig.is_formatting_by_aggregation_method) {
+            return highchartsRenderer.getDateFormatByTimeframe(aggregationConfig.aggregate_by, dateField.format);
         }
+        return dateField.format;
     }
 
-    highchartsRenderer.getDateFormatByAggregation = function(timeframe, defaultDateFormat) {
+    highchartsRenderer.getDateFormatByTimeframe = function(timeframe, defaultDateFormat) {
         switch (timeframe) {
             case 'month':
                 return 'MMM-YY';