Merge pull request #814 from greenriver/release-57

Release 57

Gemfile.lock

@@ -543,7 +543,8 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     roo (2.10.1)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -654,6 +655,7 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     ssrf_filter (1.1.2)
+    strscan (3.1.0)
     temple (0.10.3)
     terser (1.2.2)
       execjs (>= 0.3.0, < 3)

app/models/deidentified_client.rb

@@ -76,7 +76,11 @@ def download_headers
         'Requires elevator access',
         Translation.translate('Part of a family'),
         Translation.translate('Chronically homeless family'),
-        'Gender',
+        'Woman (Girl, if child)',
+        'Man (Boy, if child)',
+        'Non-Binary',
+        'Transgender',
+        'Questioning',
         Translation.translate('Date days homeless verified'),
         'Who verified days homeless',
         'Total monthly income',
@@ -129,7 +133,11 @@ def download_data
         current_assessment.requires_elevator_access,
         current_assessment.family_member,
         current_assessment.calculated_chronic_homelessness,
-        gender,
+        female,
+        male,
+        no_single_gender,
+        transgender,
+        questioning,
         current_assessment.date_days_homeless_verified,
         current_assessment.who_verified_days_homeless,
         current_assessment.income_total_monthly,