@datarailsshared/dr_renderer 1.2.164 → 1.2.166
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/highcharts_renderer.js +28 -8
package/package.json
CHANGED
|
@@ -3037,6 +3037,26 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
3037
3037
|
return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
|
|
3038
3038
|
};
|
|
3039
3039
|
|
|
3040
|
+
highchartsRenderer.formatFieldValue = function (field, value) {
|
|
3041
|
+
let currentType = '';
|
|
3042
|
+
switch (field.type) {
|
|
3043
|
+
case 'Date':
|
|
3044
|
+
currentType = 'd';
|
|
3045
|
+
break;
|
|
3046
|
+
case 'Float':
|
|
3047
|
+
case 'Integer':
|
|
3048
|
+
currentType = 'n';
|
|
3049
|
+
break;
|
|
3050
|
+
default:
|
|
3051
|
+
return value;
|
|
3052
|
+
}
|
|
3053
|
+
const formattedValue = highchartsRenderer.formatValue(currentType, field.format, value, null);
|
|
3054
|
+
if (formattedValue?.value === 'Invalid Date') {
|
|
3055
|
+
formattedValue.value = value;
|
|
3056
|
+
}
|
|
3057
|
+
return formattedValue?.value || formattedValue || String(value) || '';
|
|
3058
|
+
}
|
|
3059
|
+
|
|
3040
3060
|
highchartsRenderer.formatValue = function (data_type, number_format, value, widget_values_format) {
|
|
3041
3061
|
if (!number_format)
|
|
3042
3062
|
number_format = 'General';
|
|
@@ -7510,15 +7530,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7510
7530
|
return {};
|
|
7511
7531
|
|
|
7512
7532
|
var dt = new Date(fieldnametoFilter);
|
|
7513
|
-
var timeframe = '
|
|
7533
|
+
var timeframe = 'day';
|
|
7514
7534
|
if (format && highchartsRenderer.containsIgnoreCase(format, 'q'))
|
|
7515
|
-
timeframe = '
|
|
7535
|
+
timeframe = 'quarter';
|
|
7516
7536
|
else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && !highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
|
|
7517
|
-
timeframe = '
|
|
7537
|
+
timeframe = 'year';
|
|
7518
7538
|
else if (format && !highchartsRenderer.containsIgnoreCase(format, 'dd') && highchartsRenderer.containsIgnoreCase(format, 'mm') && highchartsRenderer.containsIgnoreCase(format, 'yy'))
|
|
7519
|
-
timeframe = '
|
|
7539
|
+
timeframe = 'month';
|
|
7520
7540
|
switch (timeframe) {
|
|
7521
|
-
case '
|
|
7541
|
+
case 'day':
|
|
7522
7542
|
range.val.fromdate = Math.round(Date.UTC(
|
|
7523
7543
|
dt.getFullYear(),
|
|
7524
7544
|
dt.getMonth(),
|
|
@@ -7530,7 +7550,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7530
7550
|
range.val.todate = range.val.fromdate + 60 * 60 * 24 - 1;
|
|
7531
7551
|
return range;
|
|
7532
7552
|
break;
|
|
7533
|
-
case '
|
|
7553
|
+
case 'month':
|
|
7534
7554
|
range.val.fromdate = Math.round(
|
|
7535
7555
|
Date.UTC(
|
|
7536
7556
|
dt.getFullYear(),
|
|
@@ -7549,7 +7569,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7549
7569
|
59) / 1000)
|
|
7550
7570
|
return range;
|
|
7551
7571
|
break;
|
|
7552
|
-
case '
|
|
7572
|
+
case 'year':
|
|
7553
7573
|
range.val.fromdate = Math.round(Date.UTC(
|
|
7554
7574
|
dt.getFullYear(),
|
|
7555
7575
|
dt.getMonth(),
|
|
@@ -7566,7 +7586,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7566
7586
|
) / 1000)
|
|
7567
7587
|
return range;
|
|
7568
7588
|
break;
|
|
7569
|
-
case '
|
|
7589
|
+
case 'quarter':
|
|
7570
7590
|
const utcDate = moment_lib.utc(initialDateString, format, true);
|
|
7571
7591
|
range.val.fromdate = utcDate.startOf(timeframe).unix();
|
|
7572
7592
|
range.val.todate = utcDate.endOf(timeframe).unix();
|