From 089960a5d3de036766724e4c3323a14294525a35 Mon Sep 17 00:00:00 2001 From: RujitRaval Date: Wed, 15 Jan 2020 11:29:43 -0500 Subject: [PATCH] Add validation for apartment types --- .../Questionnaire/BuildingUnitDropdown.js | 2 +- src/containers/Questionnaire/index.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/Questionnaire/BuildingUnitDropdown.js b/src/components/Questionnaire/BuildingUnitDropdown.js index e40951ec..c1f87bed 100644 --- a/src/components/Questionnaire/BuildingUnitDropdown.js +++ b/src/components/Questionnaire/BuildingUnitDropdown.js @@ -35,7 +35,7 @@ class BuildingUnitDropdown extends Component { this.handleInputChange(e)} /> diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js index b7a08801..ea65ea36 100644 --- a/src/containers/Questionnaire/index.js +++ b/src/containers/Questionnaire/index.js @@ -52,6 +52,12 @@ class Questionnaire extends Component { legalOwnership: 'Legal ownership', numberOfHeatingViolations: 'Number of heating violations', numberOfDobViolations: 'Number of DOB violations', + studio: 'Number of studio units', + oneBedroom: 'Number of one bedroom units', + twoBedroom: 'Number of two bedroom units', + threeBedroom: 'Number of three bedroom units', + fourBedroom: 'Number of four bedroom units', + numOfOther: 'Number of other units', }; this.state = { buildingInfo: {}, @@ -141,6 +147,13 @@ class Questionnaire extends Component { if (fieldData[0] === 'email' && !(validEmail.test(fieldData[1]))) { invalidFields.push(this.nameMapping[fieldData[0]]); } + if (fieldData[0] === 'unitInfo') { + Object.entries(fieldData[1]).forEach(unitData => { + if (unitData[0] !== 'other' && isNaN(unitData[1]) === true) { + emptyFields.push(this.nameMapping[unitData[0]]); + } + }); + } if (typeof fieldData[1] === 'object' && fieldData[1].answer_id !== undefined && parseInt(fieldData[1].answer_id, 10) === -1 && -- GitLab