fix floating time issue, xaxis window issue and show missing refresh

Author: TrystanLea

graph.core.js

@@ -76,7 +76,7 @@ const GraphLayoutApp = {
 					? GH.formatGraphWindowTime(ms)
 					: new Date(ms).toLocaleString();
 
-			return { start: formatTs(startMs), end: formatTs(endMs), length: `${hours}h${mins} (${windowSecs} seconds)` };
+			return { start: formatTs(startMs), end: formatTs(endMs), length: `${hours}h${mins} (${windowSecs} seconds)`, floating: !!this.state.floatingtime };
 		},
 
 		selectedSavedGraph() {
@@ -134,7 +134,9 @@ const GraphLayoutApp = {
 	watch: {
 		savedGraphSelected(v) { this.onSavedGraphSelectedChange(v); },
 		'state.showlegend':    'renderChart',
-		'state.showmissing':   'renderChart',
+		// showmissing maps to the skipmissing fetch param, so it must re-fetch
+		// (a re-render alone can't restore data the server already skipped).
+		'state.showmissing':   'fetchFeedData',
 		'state.showtag':       'renderChart',
 		'state.csvtimeformat': 'updateCsvText',
 		'state.csvnullvalues': 'updateCsvText',
@@ -1089,6 +1091,14 @@ const GraphLayoutApp = {
 			const { startMs, endMs } = this.getWindowRange();
 			let { start: s, end: e } = normalized;
 			if (!isFinite(s) || !isFinite(e) || s >= e) { s = startMs; e = endMs; }
+			// A floating-time graph stores a relative window: re-anchor it to "now"
+			// on load, keeping the saved duration, so it always shows recent data.
+			else if (normalized.floatingtime) {
+				const now = Math.round(Date.now() / 1000) * 1000;
+				this.graphTimeHours = String(Math.round((e - s) / 3600_000));
+				s = now - (e - s);
+				e = now;
+			}
 
 			this.syncWindowInputs(s, e);
 			this.applySavedGraphState(normalized);

graph.lib.js

@@ -388,7 +388,11 @@ const buildFlotOptions = (startMs, endMs, state) => {
 	applyYAxisBounds(yaxes[1], state.yaxismin2, state.yaxismax2);
 	return {
 		lines:     { fill: false, lineWidth: 2 },
-		xaxis:     { mode: 'time', timezone: 'browser', min: startMs, max: endMs,
+		xaxis:     { mode: 'time', timezone: 'browser', min: startMs*0.001, max: endMs*0.001,
+		             // Honour the requested view window regardless of where data
+		             // exists; without this Flot 5's default autoScale ("exact")
+		             // snaps the axis to the data extents instead.
+		             autoScale: 'none',
 		             monthNames: monthNamesShort,
 		             dayNames:   dayNamesShort,
 		             axisPan: true,

module.json

@@ -1,6 +1,6 @@
 {
     "name"         : "Graph",
-    "version"      : "3.2.3",
+    "version"      : "3.2.4",
     "location"     : "/var/www/emoncms/Modules",
     "branches_available": ["stable","master"]
 }

view.php

@@ -562,6 +562,7 @@
 			<div id="window-info" class="window-info" v-if="windowInfo">
 				<b><?php echo tr('Window'); ?>:</b> {{ windowInfo.start }} <b>&#x2192;</b> {{ windowInfo.end }}
 				&nbsp;&middot;&nbsp; <b><?php echo tr('Length'); ?>:</b> {{ windowInfo.length }}
+				<span v-if="windowInfo.floating">&nbsp;&middot;&nbsp; <b><?php echo tr('Floating time on'); ?></b></span>
 			</div>
 
 		</div>