diff --git a/src/BuildingPastWaterImprovement.js b/src/BuildingPastWaterImprovement.js
deleted file mode 100644
index c4ae58b7511c2d003b149a511bf3de0e2ee78530..0000000000000000000000000000000000000000
--- a/src/BuildingPastWaterImprovement.js
+++ /dev/null
@@ -1,354 +0,0 @@
-import React from "react";
-import { Row, Col, Button, Input } from 'reactstrap';
-import './index.css';
-import { yieldExpression } from "@babel/types";
-
-
-export default class BuildingWaterImprovement extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- form: {
- newHeatingSystem: {
- questionId: 18,
- checked: !(this.props.questions[0].answer === 2 || this.props.questions[0].answer === "No"),
- answer: this.props.questions[0].value,
- },
- newCoolingSystem: {
- questionId: 19,
- checked: !(this.props.questions[1].answer === 2 || this.props.questions[1].answer === "No"),
- answer: this.props.questions[1].value,
- },
- newControl: { questionId: 20, checked: this.props.questions[2].answer === "Yes" },
- convertHeatingFuel: { questionId: 21, checked: this.props.questions[3].answer === "Yes" },
- convertHeatingSystem: { questionId: 22, checked: this.props.questions[4].answer === "Yes" },
- newDomesticHotwaterSystem: { questionId: 23, checked: this.props.questions[5].answer === "Yes" },
- addInsulation: { questionId: 24, checked: this.props.questions[6].answer === "Yes" },
- airSealBuildingEnvelope: { questionId: 25, checked: this.props.questions[7].answer === "Yes" },
- newWindows: { questionId: 26, checked: this.props.questions[8].answer === "Yes" },
- newRoof: { questionId: 27, checked: this.props.questions[9].answer === "Yes" },
- solarPanels: { questionId: 28, checked: this.props.questions[10].answer === "Yes" },
- toilets: { questionId: 29, checked: this.props.questions[11].answer === "Yes" },
- lowFlowShowerheadsFaucets: { questionId: 30, checked: this.props.questions[12].answer === "Yes" },
- ledLighting: { questionId: 31, checked: this.props.questions[13].answer === "Yes" },
- other: { questionId: 32, checked: this.props.questions[14].answer === "Yes" },
- none: { questionId: 33, checked: this.props.questions[15].answer === "Yes" },
- notSure: { questionId: 34, checked: this.props.questions[16].answer === "Yes" }
- },
- };
-
- this.heatingSystemNames = [
- 'Central steam system',
- 'Central hydronic (hot water) system',
- 'Central forced-air system',
- 'Electric baseboard',
- 'Individual heat pumps',
- 'I don\'t have a heating system',
- 'I\'m not sure',
- 'Other',
- ];
- this.coolingSystemNames = [
- 'Window A/C units',
- 'PTAC units',
- 'Rooftop air conditioning units',
- 'Central chiller plant and fan coil units',
- 'Mini split heat pump systems',
- 'I don\'t have a cooling system',
- 'VRF',
- 'Other',
- 'I\'m not sure',
- ];
-
- this.nameMapping = {
- 1 : 'Yes',
- 2: 'No',
- 96: 'Central steam system',
- 97: 'Central hydronic (hot water) system',
- 98: 'Central forced-air system',
- 99: 'Electric baseboard',
- 100: 'Individual heat pumps',
- 101: 'I don\'t have a heating system',
- 33: 'I\'m not sure',
- 12: 'Other',
- 102: 'Window A/C units',
- 103: 'PTAC units',
- 104: 'Rooftop air conditioning units',
- 105: 'Central chiller plant and fan coil units',
- 106: 'Mini split heat pump systems',
- 107: 'I don\'t have a cooling system',
- 108: 'VRF',
- };
- }
-
- prevQuestion = () => {
- this.props.prevQuestion('buildingPastWaterImprovement');
- }
-
- nextQuestion = () => {
- const answerIds = this.getAnswerIds();
- this.props.nextQuestion(
- 'buildingPastWaterImprovement',
- answerIds.map(answerId => this.nameMapping[answerId]),
- answerIds,
- );
- }
-
- getAnswerIds = () => {
- const answerIds = [];
- Object.values(this.state.form).forEach(question => {
- if (question.answer === undefined) {
- answerIds.push(question.checked ? 1 : 2);
- } else {
- answerIds.push(question.answer === "" ? 2 : parseInt(question.answer, 10));
- }
- });
- return answerIds;
- }
-
- checkAnswer = (answerName) => {
- let form = this.state.form;
- form[answerName]['checked'] = !this.state.form[answerName].checked;
- form[answerName]['answer'] = this.state.form[answerName].checked ? 1 : 2;
- this.setState({ form });
- }
-
- handleInput = (answerName, event) => {
- let form = this.state.form;
- form[answerName]['answer'] = event.target.value;
- this.setState({ form });
- }
-
- render() {
- let disabled = Object.values(this.state.form).filter(val => val.checked === true).length === 0;
-
- if(this.state.form.newHeatingSystem.checked && [0, 1].includes(this.state.form.newHeatingSystem.answer)) {
- disabled = true;
- }
- if(this.state.form.newCoolingSystem.checked && [0, 1].includes(this.state.form.newCoolingSystem.answer)) {
- disabled = true;
- }
-
- const generalDisabled = Object.keys(this.state.form).filter(key => this.state.form['none'].checked || this.state.form['notSure'].checked).length > 0 ? true : false;
- const noneDisabled = Object.keys(this.state.form).filter(key => key !== 'none' && this.state.form[key].checked).length > 0 ? true : false;
- const notSureDisabled = Object.keys(this.state.form).filter(key => key !== 'notSure' && this.state.form[key].checked).length > 0 ? true : false;
-
- return (
-
-
- Any Energy or Water Improvements in the past 5 years?
-
-
- Check all that apply
-
-
-
-
-
- {'<'} Back
-
-
-
-
-
-
-
- );
- }
-}
diff --git a/src/BuildingTypeSubType.js b/src/BuildingTypeSubType.js
index c30ceea5af4d85fd82d8f4f0f1659f53cf59ac52..760c888a92d5c725c65f30cb636d0cc694a34654 100644
--- a/src/BuildingTypeSubType.js
+++ b/src/BuildingTypeSubType.js
@@ -99,7 +99,7 @@ export default class BuildingTypeSubType extends React.Component {
What type of building do you own?
-
+
@@ -120,7 +120,7 @@ export default class BuildingTypeSubType extends React.Component {
{buildingSubTypeDropdown}
-
+
diff --git a/src/index.css b/src/index.css
index c25caa55c708913bb96bd46b9984d2213f21e238..7a3e07f24fb51861d47572b803019e3ac636213b 100644
--- a/src/index.css
+++ b/src/index.css
@@ -20,12 +20,12 @@ code {
monospace;
}
-.oakland-navBar {
+.intake-survey-navBar {
margin-top: 10% !important;
margin-left: 5% !important;
}
-.oakland-options{
+.intake-survey-options{
color: #002F43;
font-family: "AvenirNext";
margin-left: 10%;
@@ -34,7 +34,7 @@ code {
font-size: 20px;
}
-.oakland-dropdown{
+.intake-survey-dropdown{
color: #002F43;
font-family: "AvenirNext";
text-align: left;
@@ -268,7 +268,7 @@ code {
margin-left: -10%;
}
- .oakland-dropdown{
+ .intake-survey-dropdown{
width: 100%;
margin-left: 0;
}