diff --git a/src/BuildingFutureImprovement.js b/src/BuildingFutureImprovement.js index 4abb1a012bf495ce2135a982337409dea55e46e3..900616d58b72d03ccbed7a92122a4d670de9844c 100644 --- a/src/BuildingFutureImprovement.js +++ b/src/BuildingFutureImprovement.js @@ -1,5 +1,5 @@ import React from "react"; -import { Row, Col, Button, Input } from 'reactstrap'; +import { Row, Col, Button, Label, Input } from 'reactstrap'; import './index.css'; import ReactGA from 'react-ga'; @@ -152,178 +152,212 @@ export default class BuildingFutureImprovement extends React.Component {
- this.checkAnswer('newHeatingSystem')} /> Install a new heating system - { - this.state.form.newHeatingSystem.checked && - this.handleInput('newHeatingSystem', e)} - disabled={generalDisabled} - > - - { - this.props.questions[0].answerIds.map((answerId, id) => { - return ( - - ); - }) - } - - } +
- this.checkAnswer('newCoolingSystem')} /> Install a new cooling system - { - this.state.form.newCoolingSystem.checked && - this.handleInput('newCoolingSystem', e)} - disabled={generalDisabled} - > - - { - this.props.questions[1].answerIds.map((answerId, id) => { - return ( - - ); - }) - } - - } +
- this.checkAnswer('newControl')} - disabled={generalDisabled} - /> Install new controls +
- this.checkAnswer('convertHeatingFuel')} - disabled={generalDisabled} - /> Convert Heating Fuel +
- this.checkAnswer('convertHeatingSystem')} - disabled={generalDisabled} - /> Convert Heating System +
- this.checkAnswer('newDomesticHotwaterSystem')} - disabled={generalDisabled} - /> Install new domestic hotwater system +
- this.checkAnswer('addInsulation')} - disabled={generalDisabled} - /> Add Insulation +
- this.checkAnswer('airSealBuildingEnvelope')} - disabled={generalDisabled} - /> Air seal the building envelope +
- this.checkAnswer('newWindows')} - disabled={generalDisabled} - /> Install New Windows +
- this.checkAnswer('newRoof')} - disabled={generalDisabled} - /> Install New roof +
- this.checkAnswer('solarPanels')} - disabled={generalDisabled} - /> Install Solar Panels +
- this.checkAnswer('toilets')} - disabled={generalDisabled} - /> Install Toilets +
- this.checkAnswer('lowFlowShowerheadsFaucets')} - disabled={generalDisabled} - /> Low flow showerheads and faucets +
- this.checkAnswer('ledLighting')} - disabled={generalDisabled} - /> Install LED lighting +
- this.checkAnswer('other')} - disabled={generalDisabled} - /> Other +
- this.checkAnswer('none')} - disabled={noneDisabled} - /> None +
- this.checkAnswer('notSure')} - disabled={notSureDisabled} - /> I'm not sure +
diff --git a/src/BuildingPastImprovement.js b/src/BuildingPastImprovement.js index bba1b6d2f62daaf1737baafb9e25bd36e895b0ab..0e9c8cf599df6f58cfd9e13c49dee4db83871a99 100644 --- a/src/BuildingPastImprovement.js +++ b/src/BuildingPastImprovement.js @@ -1,5 +1,5 @@ import React from "react"; -import { Row, Col, Button, Input } from 'reactstrap'; +import { Row, Col, Button, Label, Input } from 'reactstrap'; import './index.css'; import ReactGA from 'react-ga'; @@ -152,187 +152,221 @@ export default class BuildingPastImprovement extends React.Component {
- this.checkAnswer('newHeatingSystem')} - disabled={generalDisabled} - /> - Installed a new heating system - { - this.state.form.newHeatingSystem.checked && +
-
- this.checkAnswer('newCoolingSystem')} - disabled={generalDisabled} - /> Installed a new cooling system - { - this.state.form.newCoolingSystem.checked && - this.handleInput('newCoolingSystem', e)} - > + this.state.form.newHeatingSystem.checked && + this.handleInput('newHeatingSystem', e)} + > { - this.props.questions[1].answerIds.map((answerId, id) => { + this.props.questions[0].answerIds.map((answerId, id) => { return ( - ); }) } - - } + + } +
- this.checkAnswer('newControl')} - disabled={generalDisabled} - /> Installed new controls +
- this.checkAnswer('convertHeatingFuel')} - disabled={generalDisabled} - /> Converted Heating Fuel +
- this.checkAnswer('convertHeatingSystem')} - disabled={generalDisabled} - /> Converted Heating System +
- this.checkAnswer('newDomesticHotwaterSystem')} - disabled={generalDisabled} - /> Installed new domestic hotwater system +
- this.checkAnswer('addInsulation')} - disabled={generalDisabled} - /> Added Insulation +
- this.checkAnswer('airSealBuildingEnvelope')} - disabled={generalDisabled} - /> Air sealed the building envelope +
- this.checkAnswer('newWindows')} - disabled={generalDisabled} - /> Installed New Windows + +
+
+
- this.checkAnswer('newRoof')} - disabled={generalDisabled} - /> Installed New roof +
- this.checkAnswer('solarPanels')} - disabled={generalDisabled} - /> Installed New Solar Panels +
- this.checkAnswer('toilets')} - disabled={generalDisabled} - /> Installed Toilets +
- this.checkAnswer('lowFlowShowerheadsFaucets')} - disabled={generalDisabled} - /> Installed Low flow showerheads and faucets +
- this.checkAnswer('ledLighting')} - disabled={generalDisabled} - /> Installed LED lighting +
- this.checkAnswer('other')} - disabled={generalDisabled} - /> Other +
- this.checkAnswer('none')} - disabled={noneDisabled} - /> None +
- this.checkAnswer('notSure')} - disabled={notSureDisabled} - /> I'm not sure +