Implement SubprojectAddresses in Subprojects
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
module SubprojectAddressesHelper
|
||||
def subproject_address_form_fields
|
||||
[:streetname, :zipcode, :city, :country]
|
||||
[:streetname, :zipcode, :city, :country, :subproject_id]
|
||||
end
|
||||
end
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -19,4 +19,9 @@
|
||||
<%= subproject_address.country %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>Subproject_ID:</strong>
|
||||
<%= subproject_address.subproject_id %>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<p style="color: green"><%= notice %></p>
|
||||
|
||||
<% content_for :title, "Adresse" %>
|
||||
|
||||
<h1>Adresse</h1>
|
||||
|
||||
<%= render @subproject_address %>
|
||||
|
||||
<div>
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
<%= link_to value.name, project_path(value) %>
|
||||
<% elsif attrib == :client || attrib == :owner || attrib == :builder %>
|
||||
<%= link_to "#{value&.company_name} (#{value&.lastname}, #{value&.firstname})", client_path(value&.id) %>
|
||||
<% elsif attrib == :subproject_address %>
|
||||
<% if value.present? %>
|
||||
<%= link_to "#{value.streetname}, #{value.zipcode} #{value.city}, #{value.country}", subproject_address_path(value) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= value.is_a?(Date) ? l(value) : value %>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user