rubyforgood · Benjamin-Couey · Jan 10, 2025 · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -71,50 +71,6 @@ class Partner < ApplicationRecord
     where(status: status.to_sym)
   }
 
-  AGENCY_TYPES = {
-    "CAREER" => "Career technical training",
-    "ABUSE" => "Child abuse resource center",
-    "BNB" => "Basic Needs Bank",
-    "CHURCH" => "Church outreach ministry",
-    "COLLEGE" => "College and Universities",
-    "CDC" => "Community development corporation",
-    "HEALTH" => "Community health program or clinic",
-    "OUTREACH" => "Community outreach services",
-    "LEGAL" => "Correctional Facilities / Jail / Prison / Legal System",
-    "CRISIS" => "Crisis/Disaster services",
-    "DISAB" => "Developmental disabilities program",
-    "DISTRICT" => "School District",
-    "DOMV" => "Domestic violence shelter",
-    "ECE" => "Early Childhood Education/Childcare",
-    "CHILD" => "Early childhood services",
-    "EDU" => "Education program",
-    "FAMILY" => "Family resource center",
-    "FOOD" => "Food bank/pantry",
-    "FOSTER" => "Foster Program",
-    "GOVT" => "Government Agency/Affiliate",
-    "HEADSTART" => "Head Start/Early Head Start",
-    "HOMEVISIT" => "Home visits",
-    "HOMELESS" => "Homeless resource center",
-    "HOSP" => "Hospital",
-    "INFPAN" => "Infant/Child Pantry/Closet",
-    "LIB" => "Library",
-    "MHEALTH" => "Mental Health",
-    "MILITARY" => "Military Bases/Veteran Services",
-    "POLICE" => "Police Station",
-    "PREG" => "Pregnancy resource center",
-    "PRESCH" => "Preschool",
-    "REF" => "Refugee resource center",
-    "ES" => "School - Elementary School",
-    "HS" => "School - High School",
-    "MS" => "School - Middle School",
-    "SENIOR" => "Senior Center",
-    "TRIBAL" => "Tribal/Native-Based Organization",
-    "TREAT" => "Treatment clinic",
-    "2YCOLLEGE" => "Two-Year College",
-    "WIC" => "Women, Infants and Children",
-    "OTHER" => "Other"
-  }.freeze
-
   ALL_PARTIALS = %w[
     media_information
     agency_stability
@@ -241,13 +197,14 @@ def agency_info
 
     return {} if profile.blank?
 
+    symbolic_agency_type = profile.agency_type&.to_sym
     @agency_info = {
       address: [profile.address1, profile.address2].select(&:present?).join(', '),
       city: profile.city,
       state: profile.state,
       zip_code: profile.zip_code,
       website: profile.website,
-      agency_type: (profile.agency_type == AGENCY_TYPES["OTHER"]) ? "#{AGENCY_TYPES["OTHER"]}: #{profile.other_agency_type}" : profile.agency_type
+      agency_type: (symbolic_agency_type == :other) ? "#{I18n.t symbolic_agency_type, scope: :partners_profile}: #{profile.other_agency_type}" : (I18n.t symbolic_agency_type, scope: :partners_profile)
     }
   end
 

diff --git a/app/models/partners/profile.rb b/app/models/partners/profile.rb
@@ -95,6 +95,49 @@ class Profile < Base
     accepts_nested_attributes_for :served_areas, allow_destroy: true
 
     has_many_attached :documents
+    enum :agency_type,
+      other: "OTHER",
+      career: "CAREER",
+      abuse: "ABUSE",
+      bnb: "BNB",
+      church: "CHURCH",
+      college: "COLLEGE",
+      cdc: "CDC",
+      health: "HEALTH",
+      outreach: "OUTREACH",
+      legal: "LEGAL",
+      crisis: "CRISIS",
+      disab: "DISAB",
+      district: "DISTRICT",
+      domv: "DOMV",
+      ece: "ECE",
+      child: "CHILD",
+      edu: "EDU",
+      family: "FAMILY",
+      food: "FOOD",
+      foster: "FOSTER",
+      govt: "GOVT",
+      headstart: "HEADSTART",
+      homevisit: "HOMEVISIT",
+      homeless: "HOMELESS",
+      hosp: "HOSP",
+      infpan: "INFPAN",
+      lib: "LIB",
+      mhealth: "MHEALTH",
+      military: "MILITARY",
+      police: "POLICE",
+      preg: "PREG",
+      presch: "PRESCH",
+      ref: "REF",
+      es: "ES",
+      hs: "HS",
+      ms: "MS",
+      senior: "SENIOR",
+      tribal: "TRIBAL",
+      treat: "TREAT",
+      twoycollege: "2YCOLLEGE",
+      wic: "WIC"
+
     validate :check_social_media, on: :edit
 
     validate :client_share_is_0_or_100
@@ -131,6 +174,11 @@ def county_list_by_region
       counties.order(%w(lower(region) lower(name))).pluck(:name).join("; ")
     end
 
+    def self.agency_types_for_selection
+      # alphabetize based on the translated version, as that is the text users will actually read
+      agency_types.keys.map(&:to_sym).sort_by { |sym| I18n.t(sym, scope: :partners_profile) }.partition { |v| v != :other }.flatten
+    end
+
     private
 
     def check_social_media

diff --git a/app/services/reports/partner_info_report_service.rb b/app/services/reports/partner_info_report_service.rb
@@ -16,7 +16,7 @@ def report
 
       entries = { 'Number of Partner Agencies' => partner_agencies }
       partner_agency_counts.each do |agency, count|
-        entries["Agency Type: #{agency || 'Unknown'}"] = count
+        entries["Agency Type: #{(I18n.t agency, scope: [:partners_profile]) || 'Unknown'}"] = count
       end
       entries['Zip Codes Served'] = partner_zipcodes_serviced
       @report = { name: 'Partner Agencies and Service Area', entries: entries }

diff --git a/app/views/partners/profiles/edit/_agency_information.html.erb b/app/views/partners/profiles/edit/_agency_information.html.erb
@@ -8,7 +8,13 @@
           </div>
           <div class="card-body">
             <%= form.input :name, label: "Agency Name", class: "form-control", wrapper: :input_group %>
-            <%= profile_form.input :agency_type, collection: Partner::AGENCY_TYPES.values, label: "Agency Type", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :agency_type,
+            # Symbolize keys, because simple_form will only do a I18n lookup for
+            # symbols
+              collection: Partners::Profile.agency_types_for_selection,
+              label: "Agency Type",
+              class: "form-control",
+              wrapper: :input_group %>
             <%= profile_form.input :other_agency_type, label: "Other Agency Type", class: "form-control", wrapper: :input_group %>
 
             <%= render "shared/custom_file_input",

diff --git a/app/views/partners/profiles/show/_agency_information.html.erb b/app/views/partners/profiles/show/_agency_information.html.erb
@@ -6,9 +6,8 @@
       <dd><%= profile.partner.name %></dd>
 
       <dt>Agency Type</dt>
-      <dd><%= profile.agency_type %></dd>
-
-      <% if profile.agency_type == "Other" %>
+      <dd><%= t profile.agency_type, scope: :partners_profile %></dd>
+      <% if profile.agency_type&.to_sym == :other %>
         <dt>Other Agency Type</dt>
         <dd><%= profile.other_agency_type %></dd>
       <% end %>

diff --git a/app/views/partners/profiles/step/_agency_information_form.html.erb b/app/views/partners/profiles/step/_agency_information_form.html.erb
@@ -4,7 +4,13 @@
 
 <%= f.fields_for :profile, profile do |pf| %>
   <div class="form-group">
-    <%= pf.input :agency_type, collection: Partner::AGENCY_TYPES.values, label: "Agency Type",  class: "form-control", wrapper: :input_group %>
+    <%= pf.input :agency_type,
+    # Symbolize keys, because simple_form will only do a I18n lookup for
+    # symbols
+      collection: Partners::Profile.agency_types_for_selection,
+      label: "Agency Type",
+      class: "form-control",
+      wrapper: :input_group %>
   </div>
 
   <div class="form-group">

diff --git a/app/views/profiles/_show.html.erb b/app/views/profiles/_show.html.erb
@@ -5,8 +5,8 @@
     <%# The field for inputting the name registers it as partner.name,  %>
     <%# not partner_profile.name, so this pulls from partner.name %>
     <p>Name: <%= @partner.name %></p>
-    <p>Agency Type: <%= partner_profile.agency_type %>
-    <% if partner_profile.agency_type == "Other" && partner_profile.other_agency_type %>
+    <p>Agency Type: <%= t partner_profile.agency_type, scope: :partners_profile %>
+    <% if partner_profile.agency_type&.to_sym == :other && partner_profile.other_agency_type %>
       (<%= partner_profile.other_agency_type %>)
     <% end %>
     </p>

diff --git a/config/locales/partners_profile.en.yml b/config/locales/partners_profile.en.yml
@@ -0,0 +1,52 @@
+agency_type_map: &agency_type_map
+  other: "Other"
+  career: "Career technical training"
+  abuse: "Child abuse resource center"
+  bnb: "Basic Needs Bank"
+  church: "Church outreach ministry"
+  college: "College and Universities"
+  cdc: "Community development corporation"
+  health: "Community health program or clinic"
+  outreach: "Community outreach services"
+  legal: "Correctional Facilities / Jail / Prison / Legal System"
+  crisis: "Crisis/Disaster services"
+  disab: "Developmental disabilities program"
+  district: "School District"
+  domv: "Domestic violence shelter"
+  ece: "Early Childhood Education/Childcare"
+  child: "Early childhood services"
+  edu: "Education program"
+  family: "Family resource center"
+  food: "Food bank/pantry"
+  foster: "Foster Program"
+  govt: "Government Agency/Affiliate"
+  headstart: "Head Start/Early Head Start"
+  homevisit: "Home visits"
+  homeless: "Homeless resource center"
+  hosp: "Hospital"
+  infpan: "Infant/Child Pantry/Closet"
+  lib: "Library"
+  mhealth: "Mental Health"
+  military: "Military Bases/Veteran Services"
+  police: "Police Station"
+  preg: "Pregnancy resource center"
+  presch: "Preschool"
+  ref: "Refugee resource center"
+  es: "School - Elementary School"
+  hs: "School - High School"
+  ms: "School - Middle School"
+  senior: "Senior Center"
+  tribal: "Tribal/Native-Based Organization"
+  treat: "Treatment clinic"
+  twoycollege: "Two-Year College"
+  wic: "Women, Infants and Children"
+
+en:
+  partners_profile:
+    *agency_type_map
+
+  simple_form:
+    options:
+      profile:
+        agency_type:
+          *agency_type_map
diff --git a/db/migrate/20241122201255_cleanup_partner_agency_types.rb b/db/migrate/20241122201255_cleanup_partner_agency_types.rb