From 02557a32a0b132d61a19f715147b5ca600f8e04b Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 8 May 2018 14:57:28 -0400 Subject: [PATCH 1/3] Add thresholds for IAQ --- src/containers/Sensors/SensorGraphIAQ.js | 89 ++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 6 deletions(-) diff --git a/src/containers/Sensors/SensorGraphIAQ.js b/src/containers/Sensors/SensorGraphIAQ.js index 25f4fae7..22805333 100644 --- a/src/containers/Sensors/SensorGraphIAQ.js +++ b/src/containers/Sensors/SensorGraphIAQ.js @@ -5,6 +5,7 @@ import { connect } from 'react-redux'; import debounce from 'lodash.debounce'; import { Table, Card, Nav, NavItem, NavLink, + UncontrolledTooltip, } from 'reactstrap'; import { Charts, @@ -469,7 +470,17 @@ class SensorGraphIAQ extends Component {
-

Humidity

+

+ Humidity + {' '} + + + Threshold determined using the OSHA. 2003 standard + +

{this.state.humidityTimeseries.length > 0 && @@ -498,13 +509,25 @@ class SensorGraphIAQ extends Component { id="y" label="% Humidity" min={0} - max={50} + max={100} width="50" type="linear" format=".2f" /> {this.renderLineGraph(this.state.humidityTimeseries)} + + @@ -513,7 +536,17 @@ class SensorGraphIAQ extends Component {

-

CO2

+

+ CO2 + {' '} + + + Threshold determined using the ASHRAE 2010 standard + +

{this.state.co2Timeseries.length > 0 && @@ -549,6 +582,12 @@ class SensorGraphIAQ extends Component { /> {this.renderLineGraph(this.state.co2Timeseries)} + @@ -557,7 +596,17 @@ class SensorGraphIAQ extends Component {

-

Chemicals

+

+ Chemicals + {' '} + + + Threshold determined using the EPA 2014 standard + +

{this.state.chemicalsTimeseries.length > 0 && @@ -593,6 +642,12 @@ class SensorGraphIAQ extends Component { /> {this.renderLineGraph(this.state.chemicalsTimeseries)} + @@ -601,7 +656,17 @@ class SensorGraphIAQ extends Component {

-

Dust

+

+ Dust + {' '} + + + Threshold determined using the EPA 2014 standard + +

{this.state.dustTimeseries.length > 0 && @@ -630,13 +695,25 @@ class SensorGraphIAQ extends Component { id="y" label="mcg3 Dust" min={5} - max={20} + max={30} width="50" type="linear" format=".2f" /> {this.renderLineGraph(this.state.dustTimeseries)} + + -- GitLab From 8dcacb863603919a0a2cadb3b2263792472169a5 Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 8 May 2018 16:54:57 -0400 Subject: [PATCH 2/3] Fix issues --- src/containers/Sensors/SensorGraphIAQ.js | 54 ++++++++++++++++-------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/containers/Sensors/SensorGraphIAQ.js b/src/containers/Sensors/SensorGraphIAQ.js index 22805333..4b79d7f4 100644 --- a/src/containers/Sensors/SensorGraphIAQ.js +++ b/src/containers/Sensors/SensorGraphIAQ.js @@ -420,7 +420,19 @@ class SensorGraphIAQ extends Component { {this.renderLatestReadings()}
-

Temperature

+

+ Temperature + {' '} + + + + + Threshold determined using the OSHA. 2003 standard + +

{this.state.temperatureTimeseries.length > 0 && @@ -449,7 +461,7 @@ class SensorGraphIAQ extends Component { id="y" label="°F" min={0} - max={120} + max={100} width="50" type="linear" format=".2f" @@ -459,7 +471,13 @@ class SensorGraphIAQ extends Component { + @@ -473,7 +491,9 @@ class SensorGraphIAQ extends Component {

Humidity {' '} - + + + @@ -539,7 +559,9 @@ class SensorGraphIAQ extends Component {

CO2 {' '} - + + + Chemicals {' '} - + + + Dust {' '} - + + + - -- GitLab From 6741d8085a42c26393b7812c4d794efadaef35ce Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 8 May 2018 16:55:40 -0400 Subject: [PATCH 3/3] Make dust range larger --- src/containers/Sensors/SensorGraphIAQ.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Sensors/SensorGraphIAQ.js b/src/containers/Sensors/SensorGraphIAQ.js index 4b79d7f4..8c4aa948 100644 --- a/src/containers/Sensors/SensorGraphIAQ.js +++ b/src/containers/Sensors/SensorGraphIAQ.js @@ -721,7 +721,7 @@ class SensorGraphIAQ extends Component { id="y" label="mcg3 Dust" min={5} - max={30} + max={40} width="50" type="linear" format=".2f" -- GitLab