Moving the state and county from ruby model to the erb themselves

Author: cram-cfa

app/views/screener_mailer/send_screener_results.html.erb

@@ -26,8 +26,10 @@
 <h3 style="font-weight: bold;">
   <%= t('views.screener_mailer.send_screener_results.how_to_submit_heading') %>
 </h3>
-<% website = LocationData::Counties.website_for(@state, @county) %>
-<% email = LocationData::Counties.email_for(@state, @county) %>
+<% state = @screener.state %>
+<% county = @screener.county %>
+<% website = LocationData::Counties.website_for(state, county) %>
+<% email = LocationData::Counties.email_for(state, county) %>
 
 <ol style="line-height: 2;">
   <li>
@@ -39,7 +41,7 @@
     <strong><%= t('views.screener_mailer.send_screener_results.mail_label') %></strong> <%= t('views.screener_mailer.send_screener_results.mail_instructions') %>
     <br/><br/>
     <div style="font-style: italic;">
-      <% LocationData::Counties.mailing_address_for(@state, @county).split("\n").map do |line| %>
+      <% LocationData::Counties.mailing_address_for(state, county).split("\n").map do |line| %>
         <%= line %>
         <br/>
       <% end %>
@@ -49,7 +51,7 @@
     <strong><%= t('views.screener_mailer.send_screener_results.in_person_label') %></strong> <%= t('views.screener_mailer.send_screener_results.in_person_instructions') %>
     <br/><br/>
     <div style="font-style: italic;">
-      <% LocationData::Counties.physical_address_for(@state, @county).split("\n").map do |line| %>
+      <% LocationData::Counties.physical_address_for(state, county).split("\n").map do |line| %>
         <%= line %>
         <br/>
       <% end %>
@@ -68,7 +70,7 @@
       <%= t('views.screener_mailer.send_screener_results.email_office', email: email) %>
     </li>
   <% end %>
-  <% if (phone = LocationData::Counties.phone_for(@state, @county)).present? %>
+  <% if (phone = LocationData::Counties.phone_for(state, county)).present? %>
     <li><%= t('views.screener_mailer.send_screener_results.call_office', phone: phone) %></li>
   <% end %>
 </ul>

app/views/screener_mailer/send_screener_results.text.erb

@@ -11,8 +11,10 @@
 <%= t('views.screener_mailer.send_screener_results.reference_code', code: @screener.confirmation_code) %>
 
 ---
-<% website = LocationData::Counties.website_for(@state, @county) %>
-<% email = LocationData::Counties.email_for(@state, @county) %>
+<% state = @screener.state %>
+<% county = @screener.county %>
+<% website = LocationData::Counties.website_for(state, county) %>
+<% email = LocationData::Counties.email_for(state, county) %>
 
 <%= t('views.screener_mailer.send_screener_results.how_to_submit_heading') %>
 
@@ -22,18 +24,18 @@
 
 2. <%= t('views.screener_mailer.send_screener_results.mail_label') %> <%= t('views.screener_mailer.send_screener_results.mail_instructions') %>
 
-   <%= LocationData::Counties.mailing_address_for(@state, @county).split("\n").join("\n   ") %>
+   <%= LocationData::Counties.mailing_address_for(state, county).split("\n").join("\n   ") %>
 
 3. <%= t('views.screener_mailer.send_screener_results.in_person_label') %> <%= t('views.screener_mailer.send_screener_results.in_person_instructions') %>
 
-   <%= LocationData::Counties.physical_address_for(@state, @county).split("\n").join("\n   ") %>
+   <%= LocationData::Counties.physical_address_for(state, county).split("\n").join("\n   ") %>
 
 <%= t('views.screener_mailer.send_screener_results.questions_intro') %>
 
 - <%= t('views.screener_mailer.send_screener_results.check_website', website: website) %>
 <% if email.present? %>
 - <%= t('views.screener_mailer.send_screener_results.email_office', email: email) %>
 <% end %>
-<% if (phone = LocationData::Counties.phone_for(@state, @county)).present? %>
+<% if (phone = LocationData::Counties.phone_for(state, county)).present? %>
 - <%= t('views.screener_mailer.send_screener_results.call_office', phone: phone) %>
 <% end %>