From ea9d032ad4460cece6d14d9e62b294fe619250ea Mon Sep 17 00:00:00 2001
From: Ben <benjamen@obdev.io>
Date: Mon, 5 Feb 2024 17:54:10 -0600
Subject: [PATCH] Updated all address fields on their respective show pages to
 be the proper formatting.

---
 app/assets/stylesheets/application.css | 2 --
 app/views/employers/show.html.erb      | 6 +++++-
 app/views/participants/show.html.erb   | 5 ++++-
 app/views/workers/show.html.erb        | 6 +++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 0598f6a..640ce81 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -22,5 +22,3 @@
 .pagination .page-item.active .page-link {
     border-color: var(--bs-dark);
 }
-
-  
\ No newline at end of file
diff --git a/app/views/employers/show.html.erb b/app/views/employers/show.html.erb
index a206e56..da7afe2 100644
--- a/app/views/employers/show.html.erb
+++ b/app/views/employers/show.html.erb
@@ -14,7 +14,11 @@
           </tr>
           <tr>
             <th>Address</th>
-            <td><%= [@employer.address_line_1, @employer.address_line_2, @employer.city, @employer.state, @employer.zip].reject(&:blank?).join(', ') %></td>
+            <td>
+              <%= @employer.address_line_1 %><%= ', ' + @employer.address_line_2 unless @employer.address_line_2.blank? %>
+            <br>
+              <%= "#{@employer.city}, #{@employer.state} #{@employer.zip}" %>
+            </td>
           </tr>
           <tr>
             <th>Phone</th>
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb
index be2f698..20dece5 100644
--- a/app/views/participants/show.html.erb
+++ b/app/views/participants/show.html.erb
@@ -14,7 +14,10 @@
           </tr>
           <tr>
             <th>Address</th>
-            <td><%= [@participant.address_line_1, @participant.address_line_2, @participant.city, @participant.state, @participant.zip].reject(&:blank?).join(', ') %></td>
+            <td><%= @participant.address_line_1 %><%= ', ' + @participant.address_line_2 unless @participant.address_line_2.blank? %>
+          <br>
+            <%= "#{@participant.city}, #{@participant.state} #{@participant.zip}" %>
+            </td>
           </tr>
           <tr>
             <th>Phone</th>
diff --git a/app/views/workers/show.html.erb b/app/views/workers/show.html.erb
index 79357b9..afaa274 100644
--- a/app/views/workers/show.html.erb
+++ b/app/views/workers/show.html.erb
@@ -14,7 +14,11 @@
           </tr>
           <tr>
             <th>Address</th>
-            <td><%= [@worker.address_line_1, @worker.address_line_2, @worker.city, @worker.state, @worker.zip].reject(&:blank?).join(', ') %></td>
+            <td>
+              <%= @worker.address_line_1 %><%= ', ' + @worker.address_line_2 unless @worker.address_line_2.blank? %>
+          <br>
+              <%= "#{@worker.city}, #{@worker.state} #{@worker.zip}" %>
+            </td>
           </tr>
           <tr>
             <th>Phone</th>