Merge pull request openWB#62 from openWB/web

fix graph after reboot

Author: benderl

graphing.sh

@@ -63,14 +63,14 @@ graphing(){
 	if ((speichervorhanden == 1 )); then
 		dataline="$dataline,\"bat-all-power\":$(convertTokW $speicherleistung),\"bat-all-soc\":$speichersoc"
 	fi
-	# smarthoome 1
+	# smarthome 1
 	if (( verbraucher1_aktiv == 1 )); then
 		dataline="$dataline,\"load1-power\":$(convertTokW $verbraucher1_watt)"
 	fi
 	if (( verbraucher2_aktiv == 1 )); then
 		dataline="$dataline,\"load2-power\":$(convertTokW $verbraucher2_watt)"
 	fi
-	# end JSON
+
 	dataline="$dataline}"
 	printf "$dataline\n" >> /var/www/html/openWB/ramdisk/all-live.json
 	echo "$(tail -$livegraph /var/www/html/openWB/ramdisk/all-live.json)" > /var/www/html/openWB/ramdisk/all-live.json
@@ -108,6 +108,7 @@ graphing(){
 	mosquitto_pub -t openWB/graph/alllivevaluesJson14 -r -m "$([ ${#all14livevalues} -ge 10 ] && echo "$all14livevalues" || echo "-")" &
 	mosquitto_pub -t openWB/graph/alllivevaluesJson15 -r -m "$([ ${#all15livevalues} -ge 10 ] && echo "$all15livevalues" || echo "-")" &
 	mosquitto_pub -t openWB/graph/alllivevaluesJson16 -r -m "$([ ${#all16livevalues} -ge 10 ] && echo "$all16livevalues" || echo "-")" &
+	# end JSON
 
 	# csv graphing
 	header="Zeit,Timestamp,EVU,Ladeleistung,PV,LP1,LP2,Ladeleistung2,Speicherleistung,SpeicherSoC,LP1SoC,LP2SoC,Hausverbrauch,Verbraucher1,Verbraucher2,LP3,LP4,LP5,LP6,LP7,LP8,SH1,SH2,SH3,SH4,SH5,SH6,SH7,SH8,SH9,SH1T0,SH1T1,SH1T2"

publishvars2.py

@@ -268,3 +268,6 @@ def pub_settings():
     pub.pub("openWB/set/general/range_unit", "km")
     pub.pub("openWB/set/general/price_kwh", 0.2)
     pub.pub("openWB/set/general/grid_protection_configured", True)
+
+    # graph
+    pub.pub("openWB/graph/config/duration", 30)

web/themes/dark/livechart.js

@@ -26,6 +26,7 @@ var smartHomeBgColor = style.getPropertyValue('--d1bgCol');
 
 var initialread = 0;
 var graphloaded = 0;
+var maxDisplayLength;
 var boolDisplayHouseConsumption;
 var boolDisplayLoad1;
 var boolDisplayLoad2;
@@ -585,7 +586,9 @@ function putgraphtogether() {
 	if ( (all1 == 1) && (all2 == 1) && (all3 == 1) && (all4 == 1) && (all5 == 1) && (all6 == 1) && (all7 == 1) && (all8 == 1) && (all9 == 1) && (all10 == 1) && (all11 == 1) && (all12 == 1) && (all13 == 1) && (all14 == 1) && (all15 == 1) && (all16 == 1) ){
 		var alldata = all1p + "\n" + all2p + "\n" + all3p + "\n" + all4p + "\n" + all5p + "\n" + all6p + "\n" + all7p + "\n" + all8p + "\n" + all9p + "\n" + all10p + "\n" + all11p + "\n" + all12p + "\n" + all13p + "\n" + all14p + "\n" + all15p + "\n" + all16p;
 		allChartData = parseData(alldata);
-		if ( allChartData.length >= 30 ) {
+		console.log("allChartData.length: "+allChartData.length);
+		if ( allChartData.length >= 30 ) { // 5 minutes * 6 measurements/min
+			console.log("received at least "+maxDisplayLength+" data sets for graph");
 			Object.keys(allChartData[allChartData.length - 1]).forEach(function(key){
 				if(key != 'time' && key != 'timestamp'){
 					initDataset(key);
@@ -594,9 +597,10 @@ function putgraphtogether() {
 			// after receipt of all data segments, unsubscribe from these topics to save bandwidth
 			unsubscribeMqttGraphSegments();
 
+			initialread = 1 ;
+			$('#waitforgraphloadingdiv').text('Graph lädt...');
 			checkgraphload();
 			// now we are ready to receive small updates for graph data
-			initialread = 1 ;
 		} else {
 			all1 = 0;
 			all2 = 0;
@@ -623,24 +627,24 @@ function putgraphtogether() {
 
 function updateGraph(dataset) {
 	chartUpdateBuffer = chartUpdateBuffer.concat(parseData(dataset));
-	// console.log('buffer: '+chartUpdateBuffer.length);
 	if(initialread == 1 && myLine != undefined){
 		chartUpdateBuffer.forEach(function(row, index){
-			// console.log('adding row: '+index);
 			allChartData.push(row);
 		});
-		// ToDo: remove data based on configured size
-		if(allChartData.length > 30){
-			allChartData.splice(0, chartUpdateBuffer.length);
+		if(typeof maxDisplayLength !== "undefined"  && allChartData.length > maxDisplayLength){
+			// allChartData.splice(0, chartUpdateBuffer.length);
+			allChartData.splice(0, allChartData.length - maxDisplayLength);
 		}
+		console.log("allChartData.length: "+allChartData.length);
 		chartUpdateBuffer = [];
 		myLine.update();
 	} else {
-		// console.log('graph not yet initialized, data stored in buffer');
+		console.log('graph not yet initialized, data stored in buffer');
 	}
 }
 
 function checkgraphload(){
+	console.log("checkgraphload: graphloaded: "+graphloaded+" initialread: "+initialread);
 	if ( graphloaded == 1 ) {
 		myLine.destroy();
 		loadgraph(0);  // when reloading graph, no more "pumping" animations
@@ -665,6 +669,7 @@ function checkgraphload(){
 		typeof boolDisplayEvu === "boolean" &&
 		typeof boolDisplayPv === "boolean" &&
 		typeof boolDisplayLegend === "boolean" ) {
+		console.log("all bools received");
 		if ( initialread != 0 ) {
 			if ( graphloaded == 0 ) {
 				graphloaded = 1;
@@ -735,6 +740,10 @@ function forcegraphload() {
 		if ( !(typeof boolDisplayLegend === "boolean") ) {
 			showhidedataset('boolDisplayLegend');
 		}
+		if ( typeof maxDisplayLength === "undefined" ) {
+			console.log("setting graph duration to default of 30 minutes");
+			maxDisplayLength = 30 * 6;
+		}
 		checkgraphload();
 	}
 }  // end forcegraphload

web/themes/dark/processAllMqttMsg.js

@@ -1090,6 +1090,15 @@ function processGraphMessages(mqttmsg, mqttpayload) {
 		}
 		graphrefreshcounter += 1;
 	}
+	else if ( mqttmsg == 'openWB/graph/config/duration' ) {
+		console.log("graph duration: "+mqttpayload+" minutes");
+		var duration = JSON.parse(mqttpayload);
+		if( isNaN(duration) || duration < 10 || duration > 120 ){
+			console.log("bad graph duration received: "+mqttpayload+" setting to default of 30");
+			duration = 30;
+		}
+		maxDisplayLength = duration * 6; // we get 6 measurements in every minute
+	}
 }  // end processGraphMessages
 
 function processETProviderMessages(mqttmsg, mqttpayload) {

web/themes/dark/setupMqttServices.js

@@ -74,6 +74,7 @@ var topicsToSubscribe = [
 	["openWB/optional/et/config/max_price", 1],	// configured max price
 
 	// graph topcis
+	["openWB/graph/config/duration", 1],				// maximum duration to display in landing page
 	["openWB/graph/boolDisplayLp1", 1],
 	["openWB/graph/boolDisplayLp2", 1],
 	["openWB/graph/boolDisplayLp3", 1],