From e553b1f595cda558688833c56297963b12edd488 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Wed, 20 Dec 2017 15:24:42 -0500 Subject: [PATCH 1/4] Add filter param to only retrieve temperature data --- src/containers/Sensors/SensorGraph.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/containers/Sensors/SensorGraph.js b/src/containers/Sensors/SensorGraph.js index 23c83069..57b96eab 100644 --- a/src/containers/Sensors/SensorGraph.js +++ b/src/containers/Sensors/SensorGraph.js @@ -42,6 +42,7 @@ class Sensors extends Component { nodes: '', data: '', from: this.state.from.toUTCString(), + unit_id: 1, // Temperature }); } @@ -64,7 +65,13 @@ class Sensors extends Component { const { sensorData } = props.sensors; let nodes = []; sensorData.forEach(gateway => { - nodes = [...nodes, ...gateway.nodes.map(oneNode => this.generateTimeSeries(oneNode))]; + nodes = [...nodes, ...gateway.nodes.reduce((acc, oneNode) => { + if (!oneNode.temperature_probe_1 && !oneNode.temperature_probe_2 && + !oneNode.temperature_probe_3 && !oneNode.temperature_probe_4) { + acc.push(this.generateTimeSeries(oneNode)); + } + return acc; + }, [])]; }); if (nodes.length === 0) { @@ -150,9 +157,7 @@ class Sensors extends Component { // Get all points const points = sensorNode.data.reduce((acc, i) => { - if (i.name === 'Temperature') { - acc.push([new Date(i.ts), i.value]); - } + acc.push([new Date(i.ts), i.value]); return acc; }, []); -- GitLab From a88c625cc9ac8e93f582d6a1ecbf129361f384b2 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Wed, 20 Dec 2017 15:30:54 -0500 Subject: [PATCH 2/4] Add unit id to debounce func --- src/containers/Sensors/SensorGraph.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/containers/Sensors/SensorGraph.js b/src/containers/Sensors/SensorGraph.js index 57b96eab..aa389d7a 100644 --- a/src/containers/Sensors/SensorGraph.js +++ b/src/containers/Sensors/SensorGraph.js @@ -188,6 +188,7 @@ class Sensors extends Component { nodes: '', data: '', from: from.toUTCString(), + unit_id: 1, // Temperature }); }, 500); @@ -249,6 +250,11 @@ class Sensors extends Component { } +
+
+ {this.props.sensors.loading && 'loading...'} +
+
Date: Thu, 21 Dec 2017 10:15:16 -0500 Subject: [PATCH 3/4] Convert Watts to MBH in envelope page --- src/containers/Envelope/index.js | 2 +- src/containers/Envelope/reducer.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/containers/Envelope/index.js b/src/containers/Envelope/index.js index cde76b25..944cefae 100644 --- a/src/containers/Envelope/index.js +++ b/src/containers/Envelope/index.js @@ -414,7 +414,7 @@ class Envelope extends Component { {envelope.designLoad.data.map(i => ( - {i[0]} + {`${i[0]} (MBH)`} ))} diff --git a/src/containers/Envelope/reducer.js b/src/containers/Envelope/reducer.js index f5a118fe..5fcfa394 100644 --- a/src/containers/Envelope/reducer.js +++ b/src/containers/Envelope/reducer.js @@ -23,6 +23,7 @@ import { } from './constants'; const J_TO_MMBTU = 9.4708 * (10 ** -10); +const WATTS_TO_MBH = 0.00341214163312794; const envelopeInitialState = { simStatus: { @@ -207,7 +208,7 @@ export default function (state = envelopeInitialState, action) { ...state, designLoad: { ...envelopeInitialState.designLoad, - data: action.payload, + data: action.payload.map(i => [i[0], +(i[1] * WATTS_TO_MBH).toFixed(2)]), }, }; -- GitLab From 7d656ab79c76da156e1acb83c798ea6b6437de0f Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Thu, 21 Dec 2017 10:25:46 -0500 Subject: [PATCH 4/4] Add loading icon --- src/containers/Sensors/SensorGraph.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/containers/Sensors/SensorGraph.js b/src/containers/Sensors/SensorGraph.js index aa389d7a..d682acb7 100644 --- a/src/containers/Sensors/SensorGraph.js +++ b/src/containers/Sensors/SensorGraph.js @@ -14,6 +14,7 @@ import { Legend, } from 'react-timeseries-charts'; import { TimeSeries, TimeRange } from 'pondjs'; +import { Icon } from 'react-fa'; import { loadAllNodeData } from './actions'; import { subtractDaysFromNow } from '../../utils/date'; import { GRAPH_COLORS } from './colors'; @@ -238,7 +239,7 @@ class Sensors extends Component { return (
-
+
{this.state.showChart && ({ key: i.name(), label: i.name() }))} @@ -249,14 +250,12 @@ class Sensors extends Component { /> }
-
-
-
- {this.props.sensors.loading && 'loading...'} +
+ {this.props.sensors.loading && !this.props.sensors.error && }
-
+