GIFT-274

OpenCLTBrigade · Nov 22, 2017 · c852428 · c852428
1 parent 933f780
commit c852428
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/react-ui/src/app/dashboard/household/components/FeedbackModal/FeedbackModal.jsx b/react-ui/src/app/dashboard/household/components/FeedbackModal/FeedbackModal.jsx
@@ -58,6 +58,8 @@ class FeedbackModal extends React.Component {
                     <Modal.Title>Review Household</Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
+                  {household.address && (!household.address.cmpd_division || !household.address.cmpd_response_area) &&
+                  <span style={{ fontWeight: 'bold' }}>Warning: Address is missing CMPD Division / Response Area<hr/></span>}
                     <Form
                         data={this.state.data}
                         handleFormSubmit={this.handleFormSubmit}

diff --git a/server/apps/nominations/controllers/household.js b/server/apps/nominations/controllers/household.js
@@ -52,7 +52,7 @@ module.exports = {
         whereClause = { name_last: { $like: `${query.search}%` } };
       }
 
-      const attachmentRelation = [{ model: db.household_attachment, as: 'attachment_data' }];
+      const attachmentRelation = [{ model: db.household_attachment, as: 'attachment_data' }, { model: db.household_address, as: 'address' }];
 
       const pullRelated = [...related, ...attachmentRelation];