Merge branch 'master' into develop

OpenCLTBrigade · Nov 12, 2017 · 93b1846 · 93b1846
2 parents 2b5b0be + 0e43cb1
commit 93b1846
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/react-ui/src/app/dashboard/household/components/form/head-of-household.js b/react-ui/src/app/dashboard/household/components/form/head-of-household.js
@@ -74,7 +74,6 @@ const HeadOfHousehold = () => {
                                     id="email"
                                     name="household.email"
                                     type="email"
-                                    validator={requiredValidator}
                                 />
                             </Col>
                             <Col md={4} xs={12}>

diff --git a/server/apps/nominations/validators/household.js b/server/apps/nominations/validators/household.js
@@ -7,16 +7,16 @@ const lastName = check('household.name_last').exists();
 const dob = check('household.dob').exists();
 const race = check('household.race').exists();
 const gender = check('household.gender').exists();
-const email = check('household.email').exists();
+// const email = check('household.email').exists();
 const last4ssn = check('household.last4ssn').exists();
 const preferredContact = check('household.preferred_contact_method').exists();
 
 const addressLine1 = check('address.street').exists();
 const city = check('address.city').exists();
 const state = check('address.state').exists();
 const zip = check('address.zip').exists();
-const division = check('address.cmpd_division').exists();
-const responseArea = check('address.cmpd_response_area').exists();
+// const division = check('address.cmpd_division').exists();
+// const responseArea = check('address.cmpd_response_area').exists();
 const deliveryAddressType = check('address.type').exists();
 
 const number = check('phoneNumbers.*.number').exists();
@@ -48,15 +48,12 @@ module.exports = [
   dob,
   race,
   gender,
-  email,
   last4ssn,
   preferredContact,
   addressLine1,
   city,
   state,
   zip,
-  division,
-  responseArea,
   deliveryAddressType,
   number,
   type,

diff --git a/server/seeds/01_affiliation.js b/server/seeds/01_affiliation.js
@@ -1295,6 +1295,20 @@ const cmsSchools = [
     'city': 'Charlotte',
     'state': 'NC',
     'zip': 28205
+  },
+  {
+    'name': 'Other',
+    'street': '',
+    'city': '',
+    'state': '',
+    'zip': ''
+  },
+  {
+    'name': 'No School',
+    'street': '',
+    'city': '',
+    'state': '',
+    'zip': ''
   }
 ];