Add new fields to AFWH

competitions/AFWH/ansible/roles/AFWH/files/AFWHProposal

@@ -195,6 +195,14 @@ data-filter-value="{{  proposal['Primary Subject Area']['Level 4'] }}">
 </dd>
 </div>
 {% endif -%}
+{% if 'Institution Affiliation' in proposal and proposal['Institution Affiliation'] -%}
+<div class="pair">
+<dt>Insitutation Housed within a Larger Organization</dt>
+<dd>
+{{ proposal['Institution Affiliation'] }}
+</dd>
+</div>
+{% endif -%}
 {% if 'Submittable ID' in proposal and proposal['Submittable ID'] -%}
 <div class="pair">
 <dt>Submittable ID</dt>
@@ -254,6 +262,14 @@ data-filter-value="{{  proposal['Primary Subject Area']['Level 4'] }}">
 </dd>
 </div>
 {% endif -%}
+{% if 'Equivalency Determination' in proposal and proposal['Equivalency Determination'] -%}
+<div class="pair">
+<dt>Equivalency Determination</span></dt>
+<dd>
+{{ proposal['Equivalency Determination'] }}
+</dd>
+</div>
+{% endif -%}
 {% if 'Organization Website' in proposal and proposal['Organization Website'] -%}
 <div class="pair">
 <dt></span>Applicant Organization Website or Social Media Page</dt>

competitions/AFWH/etl/compose-and-upload

@@ -473,6 +473,7 @@ def main():
     comp.add_allowlist_exception("Vision for Growth", "Application")
     comp.add_allowlist_exception("Age of Organization", "Application")
     comp.add_allowlist_exception("Additional Information", "Application")
+    comp.add_allowlist_exception("Institution Affiliation", "Application")
 
     for key in AFWHAttachments.keys:
         comp.remove_information(competition.ColumnRemover("Attachments|" + key))

competitions/AFWH/etl/deploy

@@ -72,7 +72,7 @@ if [ ! -d "${DATA_DIR}" ] ; then
   rm -rf ${DATA_DIR}/${TMP_ATTACHMENTS_DIR}
 fi
 
-if ! echo "3becce4ba950cb72f48e7ea4ce0bd32a4e126f5f  $DATA_DIR/$PROPOSALS_JSON" | sha1sum -c &> /dev/null ; then
+if ! echo "c38e4af4dec95c7559e812febc6d5b997b7c946d  $DATA_DIR/$PROPOSALS_JSON" | sha1sum -c &> /dev/null ; then
   echo "ERROR: SHA of PROPOSALS_JSON did not match expectation!"
   echo "This means that we most likely got a new file, which may have the old"
   echo "errors in it (specifically the organization proposal 829)."

competitions/AFWH/etl/pull_from_submittable.py

@@ -26,7 +26,7 @@ import json
 torque_mappings = {
     # Fields for Action For Women's Health Registration:
     "2614d3f6-2a08-413c-aa8c-578e60568f6b": "Organization Legal Status", #What is the legal status of the Applicant Organization? (Single Response)
-    "a65db225-1542-490b-bc4f-6efc00bce31c": False, #Is the Applicant Organization a specific lab or center housed within an institution of higher learning (e.g., a college or university) or a specific department or program housed within a larger organization? (Single Response)
+    "a65db225-1542-490b-bc4f-6efc00bce31c": "Institution Affiliation", #Is the Applicant Organization a specific lab or center housed within an institution of higher learning (e.g., a college or university) or a specific department or program housed within a larger organization? (Single Response)
     "777a45ee-2a7d-4150-a32f-5ada009a9ee7": "Project Name", #Project Name (Short Answer)
     "eec25dda-cfd8-4bc5-adac-c2d952ec8ab1": "Department Name", #Lab, Center, Program, or Department Name (Short Answer)
     "f96a58a9-47af-4448-9fb6-d48eb6f47928": False, #Is your organization based in the United States or U.S. Territories? (Fiscally sponsored organizations: please provide the location of the fiscal sponsor.) (Single Response)
@@ -45,7 +45,7 @@ torque_mappings = {
     "cd1e7c62-c23b-43ff-a281-298ce1767787": "Applicant Tax Identification Number|Company Number", #Company Number  (Short Answer)
     "3b9984af-f565-4def-8a12-25726d64ba3e": "Applicant Tax Identification Number|Country Name", #Enter name of country: (and Identification Number) (Short Answer)
     "e2c2d563-b182-4fc3-a9ed-70f874c89c31": "Year of Formation", #Year of Formation (Short Answer)
-    "a1d3cb44-f636-4914-bad8-d1c65ccfe96b": False, #Has the Applicant Organization previously been determined to be the equivalent of a 501(c)(3) and 509(a)(1) or (2) organization by NGOsource for which equivalency determination (ED) has not expired and would be in effect or could extend through the date of award? (Single Response)
+    "a1d3cb44-f636-4914-bad8-d1c65ccfe96b": "Equivalency Determination", #Has the Applicant Organization previously been determined to be the equivalent of a 501(c)(3) and 509(a)(1) or (2) organization by NGOsource for which equivalency determination (ED) has not expired and would be in effect or could extend through the date of award? (Single Response)
     "5b73fb6b-ecd9-4f0e-9481-db16e35530b2": "Organization Website", #Applicant Organization Website or Social Media Page (Website)
     "1b7fe176-72fe-4841-8e1e-8117e9662955": "Primary Contact|Name", #Primary contact name  (Name)
     "288766ff-4167-48ab-ad89-ad0a2ae9122f": "Primary Contact|Title", #Primary contact title (Short Answer)
@@ -190,6 +190,7 @@ torque_allowlist_exceptions = [
     "Additional Information",
     "Year of Formation",
     "Department Name",
+    "Institution Affiliation",
 ]
 
 attachment_cols = [