Robert Marshall 9 anni fa
parent
commit
487fdde9dc
1 ha cambiato i file con 11 aggiunte e 1 eliminazioni
  1. 11 1
      scripts/controllers/temperature.js

+ 11 - 1
scripts/controllers/temperature.js

@@ -33,13 +33,23 @@ app.controller('temperature', function($scope, temperatureService, $interval) {
 		startGettingData();
 	}
 
+	function getTooltipString(date, reading){
+		var dateString=date.toLocaleTimeString(navigator.language, {hour: "2-digit", minute: "2-digit"});
+		return 'Time: '+dateString+'\nReading: '+reading;
+	}
+
 	function drawChart(data) {
 		var chartData = new google.visualization.DataTable();
 		chartData.addColumn('date', 'Timestamp');
 		chartData.addColumn('number', 'Inside');
+		chartData.addColumn({type: 'string', role: 'tooltip'});
 		chartData.addColumn('number', 'Outside');
+		chartData.addColumn({type: 'string', role: 'tooltip'});
 		angular.forEach(data, function(datum) {
-			chartData.addRow([new Date(datum.Timestamp * 1000), round(parseFloat(datum.Inside), 1), round(parseFloat(datum.Outside), 1)]);
+			var date = new Date(datum.Timestamp * 1000);
+			var inside = round(parseFloat(datum.Inside), 1);
+			var outside = round(parseFloat(datum.Outside), 1);
+			chartData.addRow([date, inside, getTooltipString(date,inside), outside, getTooltipString(date,outside)]);
 		});
 		chart.draw(chartData, chartOptions);
 	}