diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 861e3a7..8f27cb8 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -10,6 +10,7 @@ class ParticipantsController < ApplicationController def show @participant = Participant.includes(:employments).find(params[:id]) @workers = @participant.workers # Fetch associated workers + @employment = Employment.new # Initialize a new Employment object end diff --git a/app/models/employment.rb b/app/models/employment.rb index 1846279..e64edee 100644 --- a/app/models/employment.rb +++ b/app/models/employment.rb @@ -1,4 +1,5 @@ class Employment < ApplicationRecord belongs_to :worker + validates :worker, presence: true belongs_to :participant end diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 7b02c67..cf50111 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -61,10 +61,9 @@ -

Linked Workers

- - - +

Linked Workers

+
+ @@ -72,19 +71,17 @@ - <% @participant.employments.each do |employment| %> - - - - - - <% end %> + <% @participant.employments.each do |employment| %> + + + + + + <% end %>
Worker Name Start Date
<%= employment.worker.name %><%= employment.start_date %><%= employment.end_date %>
<%= employment.worker&.name || 'No Worker Assigned' %><%= employment.start_date %><%= employment.end_date %>
- - -<%= form_with(url: link_worker_participant_path(@participant), method: :post) do |form| %> +<%= form_with(model: [@participant, @employment], url: link_worker_participant_path(@participant), method: :post) do |form| %>
<%= form.label :worker_id, "Select Worker" %> <%= form.collection_select :worker_id, Worker.all, :id, :name, include_blank: true %> @@ -102,3 +99,4 @@ <%= form.submit "Link Worker" %> <% end %> +