@datarailsshared/dr_renderer 1.2.163-dragons → 1.2.165

package/package.json

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

package/src/highcharts_renderer.js

@@ -7489,6 +7489,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName) {
+        const initialDateString = fieldnametoFilter;
+
         if (format) {
             format = format.replace(/y/g, 'Y');
             format = format.replace(/d/g, 'D');
@@ -7507,15 +7509,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         } else if (!highchartsRenderer.isDate(fieldnametoFilter))
             return {};
 
-
         var dt = new Date(fieldnametoFilter);
-        var timeframe = 'DAILY';
-        if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && !highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
-            timeframe = 'YEARLY';
+        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 = 'MONTHLY';
+            timeframe = 'month';
         switch (timeframe) {
-            case 'DAILY':
+            case 'day':
                 range.val.fromdate = Math.round(Date.UTC(
                     dt.getFullYear(),
                     dt.getMonth(),
@@ -7527,7 +7530,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 range.val.todate = range.val.fromdate + 60 * 60 * 24 - 1;
                 return range;
                 break;
-            case 'MONTHLY':
+            case 'month':
                 range.val.fromdate = Math.round(
                     Date.UTC(
                         dt.getFullYear(),
@@ -7546,7 +7549,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         59) / 1000)
                 return range;
                 break;
-            case 'YEARLY':
+            case 'year':
                 range.val.fromdate = Math.round(Date.UTC(
                     dt.getFullYear(),
                     dt.getMonth(),
@@ -7559,10 +7562,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     lastDay2.getFullYear(),
                     lastDay2.getMonth(),
                     lastDay2.getDate(),
-                    23, 59, 59, 999
+                    23, 59, 59
                 ) / 1000)
                 return range;
                 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();
+                return range;
             default:
                 return "";
         }