diff --git a/client/src/App.js b/client/src/App.js
index 7f8520f..964bfad 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -669,46 +669,90 @@ function Lux({name, sensorName, end, duration}) {
);
}
-function Pressure({name, sensorName, end, duration}) {
- const [data, loading, tickFormatter] = useSensor('hpa', sensorName, end, duration);
+function MultiLineChart({title, measurement, dataKey, sensors, colors, end, duration, yDomain, unitKey}) {
+ const [data, setData] = useState(false);
+ const [loading, setLoading] = useState(false);
+
+ useEffect(() => {
+ const get = async() => {
+ setLoading(true);
+ try {
+ const api_key = localStorage.getItem('api_key', 'null');
+ const params = { end: end.unix(), duration: duration.len.toLowerCase(), window: duration.win, api_key: api_key };
+
+ const responses = await Promise.all(
+ sensors.map(name => axios.get(`https://sensors-api.dns.t0.vc/history/${measurement}/${name}`, { params }))
+ );
+
+ const timeMap = {};
+ responses.forEach((res, i) => {
+ const sensorName = sensors[i];
+ res.data.forEach(d => {
+ if (!timeMap[d.time]) timeMap[d.time] = { time: d.time };
+ timeMap[d.time][sensorName] = d[dataKey];
+ });
+ });
+
+ const merged = Object.values(timeMap).sort((a, b) => a.time.localeCompare(b.time));
+ setData(merged);
+ setLoading(false);
+ } catch (error) {
+ console.log(error);
+ setLoading(false);
+ }
+ };
+ get();
+ }, [end, duration, measurement, dataKey, JSON.stringify(sensors)]);
+
+ const memoConvertTZ = (isDST, timeStr, format) => {
+ if (!timeStr) return '?';
+ let lookUp, result = null;
+ const date = timeStr.slice(5, 10);
+ const hours = timeStr.slice(11, 13);
+ const minutes = timeStr.slice(14, 16);
+ if (format === 'HH') { lookUp = [isDST, hours, format]; }
+ else { lookUp = [isDST, date, format]; }
+ if (tzcache[lookUp] != undefined ) { result = tzcache[lookUp]; }
+ else { result = moment(timeStr).tz('America/Edmonton').format(format); tzcache[lookUp] = result; }
+ if (format === 'HH') { return result + ':' + minutes; }
+ else { return result; }
+ };
+
+ const isDST = end.tz('America/Edmonton').isDST();
+ const tickFormatter = (timeStr) => memoConvertTZ(isDST, timeStr, duration.format);
return (
x.hpa?.toFixed(1) + ' hpa'}
+ lastFormatter={(x) => {
+ const vals = sensors.map(s => x[s]).filter(v => v !== undefined);
+ return vals.length ? vals[0].toFixed(1) + (units[unitKey] || '') : 'No data';
+ }}
loading={loading}
>
-
-
-
-
+
+
v.toFixed(1) + units[name]}
+ formatter={(v, name) => v.toFixed(1) + (units[unitKey] || '')}
labelFormatter={timeStr => moment(timeStr).tz('America/Edmonton').format('ddd MMM DD h:mm A')}
separator=': '
/>
-
-
-
-
+
+
+ {sensors.map((sensor, i) => (
+
+ ))}
);
}
@@ -835,9 +879,17 @@ function Graphs({end, duration}) {
-
-
-
+