@datarailsshared/dr_renderer 1.2.268 → 1.2.271

package/.circleci/config.yml

@@ -20,7 +20,7 @@ jobs:
           name: Prepare publish version
           command: |
             postfix=""
-            if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
+            if [[ "${CIRCLE_BRANCH}" != master ]] ; then
               postfix="-$CIRCLE_BRANCH"
             fi
 
@@ -70,7 +70,7 @@ workflows:
           filters:
             branches:
               only:
-                - /prod.*/
+                - /master/
                 - /tigers/
                 - /bratans/
                 - /dragons/

package/package.json

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

package/src/highcharts_renderer.js

@@ -8329,9 +8329,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return str.toLowerCase().indexOf(it) != -1;
     };
 
-    highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName) {
+    highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName, fiscalYear) {
         const initialDateString = fieldnametoFilter;
-
         if (format) {
             format = format.replace(/y/g, 'Y');
             format = format.replace(/d/g, 'D');
@@ -8393,12 +8392,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             case 'year':
                 range.val.fromdate = Math.round(Date.UTC(
                     dt.getFullYear(),
-                    dt.getMonth(),
+                    fiscalYear || dt.getMonth(),
                     1,
                     0, 0, 0, 0
                 ) / 1000);
 
-                let lastDay2 = new Date(dt.getFullYear() + 1, 0, 0);
+                let lastDay2 = new Date(dt.getFullYear() + 1, fiscalYear || 0, 0);
                 range.val.todate = Math.round(Date.UTC(
                     lastDay2.getFullYear(),
                     lastDay2.getMonth(),
@@ -8409,8 +8408,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 break;
             case 'quarter':
                 const utcDate = moment_lib.utc(initialDateString, format, true);
-                range.val.fromdate = utcDate.startOf(timeframe).unix();
-                range.val.todate = utcDate.endOf(timeframe).unix();
+                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();
+                }
                 return range;
             default:
                 return "";
@@ -8428,7 +8432,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return utcDate.startOf('day').unix();
     }
 
-    highchartsRenderer.prepareDrillDownFilters = function (r_keys, c_keys, widget) {
+    highchartsRenderer.prepareDrillDownFilters = function (r_keys, c_keys, widget, fiscalYear) {
         let row_key = r_keys;
         let col_key = c_keys;
         if (widget.options &&
@@ -8475,7 +8479,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (widget.cols[index].type === 'Date' && col_value !== NULL_VALUE) {
                         let datetrange = highchartsRenderer.createDateTypeFromValue(
                             col_value,
-                            highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
+                            highchartsRenderer.getDateFieldFormat(widget, widget.cols[index]),
+                            null,
+                            fiscalYear
                         );
 
                         if ($.isEmptyObject(datetrange)) {
@@ -8498,7 +8504,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (widget.rows[index].type === 'Date' && row_value !== NULL_VALUE) {
                     let datetrange = highchartsRenderer.createDateTypeFromValue(
                         row_value,
-                        highchartsRenderer.getDateFieldFormat(widget, widget.rows[index])
+                        highchartsRenderer.getDateFieldFormat(widget, widget.rows[index]),
+                        null,
+                        fiscalYear
                     );
 
                     if ($.isEmptyObject(datetrange)) {