Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit cee8bc96dbc8 · 2023-11-15T19:51:22.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/resources/js/src/chart.ts b/resources/js/src/chart.ts
@@ -309,7 +309,7 @@ JQPlotLineChart.prototype.populateOptions = function (dataTable, options) {
     if (optional.axes.xaxis.ticks.length === 0) {
         var data = dataTable.getData();
         for (var j = 0; j < data.length; j++) {
-            optional.axes.xaxis.ticks.push(data[j][0].toString());
+            optional.axes.xaxis.ticks.push(data[j][0] !== null ? data[j][0].toString() : null);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ JQPlotLineChart.prototype.populateOptions = function (dataTable, options) {`
`309`	`309`	`if (optional.axes.xaxis.ticks.length === 0) {`
`310`	`310`	`var data = dataTable.getData();`
`311`	`311`	`for (var j = 0; j < data.length; j++) {`
`312`		`- optional.axes.xaxis.ticks.push(data[j][0].toString());`
	`312`	`+ optional.axes.xaxis.ticks.push(data[j][0] !== null ? data[j][0].toString() : null);`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`