Merge remote-tracking branch 'origin/highcharts-fix-597' into develop…

…ment-clm
earthcubeprojects-chords · Mar 10, 2023 · 158434c · 158434c
2 parents 31b78fc + 2120f51
commit 158434c
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/views/instruments/_multivariable_graph_chart.html.haml b/app/views/instruments/_multivariable_graph_chart.html.haml
@@ -65,13 +65,13 @@
     var y_axis_js_part = '';
     y_axis_js_part += '{\n';
     y_axis_js_part += '  "labels": {\n';
-    y_axis_js_part += '      "format": "{value} ' + v.units + '"' +  ',\n';
-    y_axis_js_part += '       "style": { "color": "' + highcharts_color + '" }\n';
+    y_axis_js_part += '      "format": "{value} ' + $.trim(v.units) + '"' +  ',\n';
+    y_axis_js_part += '       "style": { "color": "' + $.trim(highcharts_color) + '" }\n';
     y_axis_js_part += '  },\n';
 
     y_axis_js_part += '  "title": {\n ';
-    y_axis_js_part += '   "text": "' + v.name + ' (' + v.units + ')",\n';
-    y_axis_js_part += '   "style": { "color": "' + highcharts_color + '" }\n';
+    y_axis_js_part += '   "text": "' + $.trim(v.name) + ' (' + $.trim(v.units) + ')",\n';
+    y_axis_js_part += '   "style": { "color": "' + $.trim(highcharts_color) + '" }\n';
     y_axis_js_part += '  },\n';
 
     y_axis_js_part += '  "opposite": false,\n';
@@ -141,7 +141,9 @@
       live_chart.series[i].setData(points);
 
       // update last times array for current variable
-      live_last_times[i] = points[points.length - 1][0];
+      if (points.length > 0) {
+        live_last_times[i] = points[points.length - 1][0];
+      }
     }
     live_chart.redraw();
   }
@@ -165,7 +167,9 @@
       }
 
       // update last times array for current variable
-      live_last_times[i] = points[points.length - 1][0];
+      if (points.length > 0) {
+        live_last_times[i] = points[points.length - 1][0];
+      }
     }
     live_chart.redraw();
   }
@@ -192,7 +196,9 @@
     live_chart.redraw();
 
     // update last times array for specific variable
-    live_last_times[series_index] = points[points.length - 1][0];
+    if (points.length > 0) {
+      live_last_times[series_index] = points[points.length - 1][0];
+    }
   }
 
   ////////////////////////////////////////////////////////////////