diff --git a/src/containers/Envelope/index.js b/src/containers/Envelope/index.js index cde76b2500ccf7d121294886deb43d15c12df342..944cefae650f3549a334a42a6b28be995087d4d9 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 f5a118fe678d4e141d03fb36836ed7036d854967..5fcfa3945d1548ac02c89089671aa332b9900030 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)]), }, }; diff --git a/src/containers/Sensors/SensorGraph.js b/src/containers/Sensors/SensorGraph.js index 23c83069bc8f5b7241606273d6fe8e315cef7c8c..d682acb7dc17ffd199319c05294f46090ceb9bd5 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'; @@ -42,6 +43,7 @@ class Sensors extends Component { nodes: '', data: '', from: this.state.from.toUTCString(), + unit_id: 1, // Temperature }); } @@ -64,7 +66,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 +158,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; }, []); @@ -183,6 +189,7 @@ class Sensors extends Component { nodes: '', data: '', from: from.toUTCString(), + unit_id: 1, // Temperature }); }, 500); @@ -232,7 +239,7 @@ class Sensors extends Component { return (
-
+
{this.state.showChart && ({ key: i.name(), label: i.name() }))} @@ -243,9 +250,12 @@ class Sensors extends Component { /> }
+
+ {this.props.sensors.loading && !this.props.sensors.error && } +
-
+