diff --git a/src/components/Questionnaire/BuildingInfo.js b/src/components/Questionnaire/BuildingInfo.js
index 79565e139e253463184a28e52d4baf1055b02153..4d1e8bf209eb32637e29ec221a95187cd1e5056d 100644
--- a/src/components/Questionnaire/BuildingInfo.js
+++ b/src/components/Questionnaire/BuildingInfo.js
@@ -166,7 +166,7 @@ class BuildingInfo extends Component {
|
- Phone No.
+ Phone No. (Optional)
|
this.handleOtherInputChange(e)}
- >
-
-
-
-
-
-
-
-
+ />
|
diff --git a/src/components/Questionnaire/BuildingUnitDropdown.js b/src/components/Questionnaire/BuildingUnitDropdown.js
index b0f236f75a92624ea0d7664e23f3e1381b897aa0..e40951ecd2a1f9712fbcb88c0e5eec8e0d67e14a 100644
--- a/src/components/Questionnaire/BuildingUnitDropdown.js
+++ b/src/components/Questionnaire/BuildingUnitDropdown.js
@@ -33,18 +33,12 @@ class BuildingUnitDropdown extends Component {
);
diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js
index c13d449c938dfdfaf27403b8428aa78bcb3fa18d..b7a08801a5cbae17adabd492a3f8e45f89e8055b 100644
--- a/src/containers/Questionnaire/index.js
+++ b/src/containers/Questionnaire/index.js
@@ -125,10 +125,13 @@ class Questionnaire extends Component {
const validPhone = /^$|^\(?(\d{3})\)?[- ]?(\d{3})[- ]?(\d{4})$/;
Object.entries(data).forEach(formData => {
+
if (['buildingInfo', 'remoteSurvey', 'financialInitials'].includes(formData[0])) {
Object.entries(formData[1]).forEach(fieldData => {
if (fieldData[0] !== 'other' &&
fieldData[0] !== 'address' &&
+ fieldData[0] !== 'buildingId' &&
+ fieldData[0] !== 'phone' &&
fieldData[1].toString().replace(/^\s+|\s+$/g, '') === '') {
emptyFields.push(this.nameMapping[fieldData[0]]);
}
@@ -147,7 +150,6 @@ class Questionnaire extends Component {
});
}
});
-
if (emptyFields.length > 0) {
errorMessage.push(`Please fill in:\n${emptyFields.join('\n')}\nfield(s)`);
alert(errorMessage);
@@ -158,7 +160,6 @@ class Questionnaire extends Component {
alert(errorMessage);
return false;
}
-
return true;
}