From 205fb7fbd6c16d9b07f1a3fd92a23b27573eac98 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 2 Feb 2024 17:40:57 -0600 Subject: [PATCH] Changed order of Vendor show view details and also changed Linked Participants to span the same width as Vendor Details for better flow and styling. --- app/views/employers/show.html.erb | 97 +++++++++++++++---------------- app/views/vendors/show.html.erb | 85 ++++++++++++++------------- app/views/workers/show.html.erb | 83 ++++++++++++++------------ 3 files changed, 138 insertions(+), 127 deletions(-) diff --git a/app/views/employers/show.html.erb b/app/views/employers/show.html.erb index 9cb942c..cacad7d 100644 --- a/app/views/employers/show.html.erb +++ b/app/views/employers/show.html.erb @@ -1,56 +1,55 @@
-
-
+
+

Employer Details

+
-
-
-

- Name: - <%= @employer.first_name %> <%= @employer.last_name %> -

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @employer.first_name %> <%= @employer.last_name %>
Address<%= [@employer.address_line_1, @employer.address_line_2, @employer.city, @employer.state, @employer.zip].reject(&:blank?).join(', ') %>
Phone<%= @employer.phone %>
Email<%= @employer.email %>
TIN<%= @employer.tin %>
Date of Birth<%= @employer.dob %>
SSN<%= @employer.ssn %>
Gender<%= @employer.gender %>
+
+
-

- Address: - <%= [@employer.address_line_1, @employer.address_line_2, @employer.city, @employer.state, @employer.zip].reject(&:blank?).join(', ') %> -

- -

- Phone: - <%= @employer.phone %> -

- -

- Email: - <%= @employer.email %> -

- -

- TIN: - <%= @employer.tin %> -

- -

- Date of Birth: - <%= @employer.dob %> -

- -

- SSN: - <%= @employer.ssn %> -

- -

- Gender: - <%= @employer.gender %> -

-
-
- -
- <%= link_to 'Edit', edit_employer_path(@employer), class: "btn btn-dark" %> - <%= link_to 'Back to List', employers_path, class: "btn btn-secondary" %> -
+ +
+
+ <%= link_to 'Edit', edit_employer_path(@employer), class: "btn btn-dark" %> + <%= link_to 'Back to List', employers_path, class: "btn btn-secondary" %>
diff --git a/app/views/vendors/show.html.erb b/app/views/vendors/show.html.erb index 3655f2e..ecc0205 100644 --- a/app/views/vendors/show.html.erb +++ b/app/views/vendors/show.html.erb @@ -1,54 +1,59 @@
-
-
+
+

Vendor Details

+
-
-
-

- Name: - <%= @vendor.name %> -

-

- Address: - <%= [@vendor.address_line_1, @vendor.address_line_2, @vendor.city, @vendor.state, @vendor.zip].reject(&:blank?).join(', ') %> -

-

- Phone: - <%= @vendor.phone %> -

-

- Email: - <%= @vendor.email %> -

-

- DBA: - <%= @vendor.dba %> -

-

- TIN: - <%= @vendor.tin %> -

-

- Contact: - <%= @vendor.contact %> -

-
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @vendor.name %>
DBA<%= @vendor.dba %>
Address<%= [@vendor.address_line_1, @vendor.address_line_2, @vendor.city, @vendor.state, @vendor.zip].reject(&:blank?).join(', ') %>
Phone<%= @vendor.phone %>
Email<%= @vendor.email %>
TIN<%= @vendor.tin %>
Contact Name<%= @vendor.contact %>
+
+
-
- <%= link_to 'Edit', edit_vendor_path(@vendor), class: "btn btn-dark" %> - <%= link_to 'Back to List', vendors_path, class: "btn btn-secondary" %> -
+ +
+
+ <%= link_to 'Edit', edit_vendor_path(@vendor), class: "btn btn-dark" %> + <%= link_to 'Back to List', vendors_path, class: "btn btn-secondary" %>
-
-
+

Linked Participants

<% if @vendor.participants.any? %> diff --git a/app/views/workers/show.html.erb b/app/views/workers/show.html.erb index 1299e83..894e23d 100644 --- a/app/views/workers/show.html.erb +++ b/app/views/workers/show.html.erb @@ -1,50 +1,57 @@
-
-
+
+

Worker Details

+
-
-
-

- Name: - <%= @worker.first_name %> <%= @worker.last_name %> -

-

- Address: - <%= [@worker.address_line_1, @worker.address_line_2, @worker.city, @worker.state, @worker.zip].reject(&:blank?).join(', ') %> -

-

- Phone: - <%= @worker.phone %> -

-

- Email: - <%= @worker.email %> -

-

- DOB: - <%= @worker.dob %> -

-

- SSN: - <%= @worker.ssn %> -

-

- Gender: - <%= @worker.gender %> -

-
-
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @worker.first_name %> <%= @worker.last_name %>
Address<%= [@worker.address_line_1, @worker.address_line_2, @worker.city, @worker.state, @worker.zip].reject(&:blank?).join(', ') %>
Phone<%= @worker.phone %>
Email<%= @worker.email %>
DOB<%= @worker.dob %>
SSN<%= @worker.ssn %>
Gender<%= @worker.gender %>
+
+
-
- <%= link_to 'Edit', edit_worker_path(@worker), class: "btn btn-dark" %> - <%= link_to 'Back to List', workers_path, class: "btn btn-secondary" %> -
+ +
+
+ <%= link_to 'Edit', edit_worker_path(@worker), class: "btn btn-dark" %> + <%= link_to 'Back to List', workers_path, class: "btn btn-secondary" %>
+

Linked Participants