@datarailsshared/dr_renderer 1.2.289 → 1.2.290

package/package.json

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

package/src/highcharts_renderer.js

@@ -4948,7 +4948,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 format = format.replace('yyyy', 'YYYY');
                 format = format.replace('yy', 'YY');
                 format = lodash.replace(format, /h/g, 'H');
-                return moment_lib(tryParse).utcOffset(0).format(format) + "";
+
+                const timeframe = highchartsRenderer.getTimeframeByFormat(format);
+                const fiscalYearMonthsModifier = highchartsRenderer.getFiscalYearMonthModifier();
+
+                let date = moment_lib(tryParse).utcOffset(0);
+                if (['quarter', 'year'].includes(timeframe)) {
+                    date = date.subtract(fiscalYearMonthsModifier, 'M');
+                }
+
+                return date.format(format) + "";
             } else {
                 return 'Wrong date format';
             }
@@ -8240,7 +8249,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return str.toLowerCase().indexOf(it) != -1;
     };
 
-    highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName, fiscalYear) {
+    highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName) {
+
+        const fiscalYearMonthsModifier = highchartsRenderer.getFiscalYearMonthModifier();
+        
         const initialDateString = fieldnametoFilter;
         if (format) {
             format = format.replace(/y/g, 'Y');
@@ -8261,13 +8273,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             return {};
 
         var dt = new Date(fieldnametoFilter);
-        var timeframe = 'day';
-        if (format && highchartsRenderer.containsIgnoreCase(format, 'q'))
-            timeframe = 'quarter';
-        else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && !highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
-            timeframe = 'year';
-        else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
-            timeframe = 'month';
+
+        const timeframe = highchartsRenderer.getTimeframeByFormat(format);
         switch (timeframe) {
             case 'day':
                 range.val.fromdate = Math.round(Date.UTC(
@@ -8303,12 +8310,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             case 'year':
                 range.val.fromdate = Math.round(Date.UTC(
                     dt.getFullYear(),
-                    fiscalYear || dt.getMonth(),
+                    fiscalYearMonthsModifier || dt.getMonth(),
                     1,
                     0, 0, 0, 0
                 ) / 1000);
 
-                let lastDay2 = new Date(dt.getFullYear() + 1, fiscalYear || 0, 0);
+                let lastDay2 = new Date(dt.getFullYear() + 1, fiscalYearMonthsModifier || 0, 0);
                 range.val.todate = Math.round(Date.UTC(
                     lastDay2.getFullYear(),
                     lastDay2.getMonth(),
@@ -8319,13 +8326,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 break;
             case 'quarter':
                 const utcDate = moment_lib.utc(initialDateString, format, true);
-                if (fiscalYear) {
-                    range.val.fromdate = utcDate.startOf(timeframe).add(fiscalYear, 'M').unix();
-                    range.val.todate = utcDate.endOf(timeframe).add(fiscalYear, 'M').unix();
-                } else {
-                    range.val.fromdate = utcDate.startOf(timeframe).unix();
-                    range.val.todate = utcDate.endOf(timeframe).unix();
-                }
+                range.val.fromdate = utcDate.startOf(timeframe).add(fiscalYearMonthsModifier, 'M').unix();
+                range.val.todate = utcDate.endOf(timeframe).add(fiscalYearMonthsModifier, 'M').unix();
                 return range;
             default:
                 return "";
@@ -8343,7 +8345,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return utcDate.startOf('day').unix();
     }
 
-    highchartsRenderer.prepareDrillDownFilters = function (r_keys, c_keys, widget, fiscalYear) {
+    highchartsRenderer.prepareDrillDownFilters = function (r_keys, c_keys, widget) {
         let row_key = r_keys;
         let col_key = c_keys;
         if (widget.options &&
@@ -8391,8 +8393,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         let datetrange = highchartsRenderer.createDateTypeFromValue(
                             col_value,
                             highchartsRenderer.getDateFieldFormat(widget, widget.cols[index]),
-                            null,
-                            fiscalYear
+                            null
                         );
 
                         if ($.isEmptyObject(datetrange)) {
@@ -8416,8 +8417,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     let datetrange = highchartsRenderer.createDateTypeFromValue(
                         row_value,
                         highchartsRenderer.getDateFieldFormat(widget, widget.rows[index]),
-                        null,
-                        fiscalYear
+                        null
                     );
 
                     if ($.isEmptyObject(datetrange)) {
@@ -9214,6 +9214,23 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
     }
 
+
+    highchartsRenderer.getFiscalYearMonthModifier = function() {
+        return lodash.get(document, 'ReportHippo.user.organization.fiscal_year_starts_from', 1) - 1;
+    }
+
+    highchartsRenderer.getTimeframeByFormat = function(format) {
+        if (format && highchartsRenderer.containsIgnoreCase(format, 'q'))
+            return 'quarter';
+        else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && !highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
+            return 'year';
+        else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
+            return 'month';
+        else {
+            return 'day';
+        }
+    }
+
     return highchartsRenderer;
 };