diff --git a/app/helpers/subproject_addresses_helper.rb b/app/helpers/subproject_addresses_helper.rb index 900a5f8..11eaba5 100644 --- a/app/helpers/subproject_addresses_helper.rb +++ b/app/helpers/subproject_addresses_helper.rb @@ -1,5 +1,5 @@ module SubprojectAddressesHelper def subproject_address_form_fields - [:streetname, :zipcode, :city, :country] + [:streetname, :zipcode, :city, :country, :subproject_id] end end \ No newline at end of file diff --git a/app/helpers/subprojects_helper.rb b/app/helpers/subprojects_helper.rb index 8255392..8171be3 100644 --- a/app/helpers/subprojects_helper.rb +++ b/app/helpers/subprojects_helper.rb @@ -4,6 +4,6 @@ module SubprojectsHelper end def subproject_view_fields - [:subproject_name, :project, :client, :owner, :builder] + [:subproject_name, :project, :client, :owner, :builder, :subproject_address] end end diff --git a/app/models/subproject.rb b/app/models/subproject.rb index fb251f3..ad18443 100644 --- a/app/models/subproject.rb +++ b/app/models/subproject.rb @@ -1,13 +1,17 @@ class Subproject < ApplicationRecord belongs_to :project + has_one :subproject_address, dependent: :destroy belongs_to :client, class_name: 'Client', optional: true belongs_to :owner, class_name: 'Client', optional: true belongs_to :builder, class_name: 'Client', optional: true + belongs_to :subproject_addresses, optional: true accepts_nested_attributes_for :client, reject_if: ->(attrs) { attrs['id'].present? || attrs.values.all?(&:blank?) } accepts_nested_attributes_for :owner, reject_if: ->(attrs) { attrs['id'].present? || attrs.values.all?(&:blank?) } accepts_nested_attributes_for :builder, reject_if: ->(attrs) { attrs['id'].present? || attrs.values.all?(&:blank?) } + accepts_nested_attributes_for :subproject_addresses, allow_destroy: true, reject_if: ->(attrs) { attrs['id'].present? || attrs.values.all?(&:blank?) } + validates :subproject_name, presence: true validate :client_presence_check diff --git a/app/views/subproject_addresses/_subproject_address.erb b/app/views/subproject_addresses/_subproject_address.erb index 48074fc..90cda58 100644 --- a/app/views/subproject_addresses/_subproject_address.erb +++ b/app/views/subproject_addresses/_subproject_address.erb @@ -19,4 +19,9 @@ <%= subproject_address.country %>
++ Subproject_ID: + <%= subproject_address.subproject_id %> +
+ diff --git a/app/views/subproject_addresses/show.html.erb b/app/views/subproject_addresses/show.html.erb index 90871bf..cbac125 100644 --- a/app/views/subproject_addresses/show.html.erb +++ b/app/views/subproject_addresses/show.html.erb @@ -1,5 +1,9 @@<%= notice %>
+<% content_for :title, "Adresse" %> + +