DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

move displayed_fields for select to procedure_controller

Browse source
This commit is contained in:
simon lehericey 2020-10-30 11:38:58 +01:00 • committed by Paul Chavard
parent 55998b1284
commit cbccdea8e0
4 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/models/procedure_presentation.rb
View file

@ -75,13 +75,14 @@ class ProcedurePresentation < ApplicationRecord
fields
end
def fields_for_select
fields.map do |field|
[field['label'], "#{field['table']}/#{field['column']}"]
end
def displayed_fields_for_select
[
fields.map { |field| [field['label'], field_id(field)] },
displayed_fields.map { |field| field_id(field) }
]
end
def displayed_field_values(dossier)
def displayed_fields_values(dossier)
displayed_fields.map { |field| get_value(dossier, field['table'], field['column']) }
end
@ -219,6 +220,10 @@ class ProcedurePresentation < ApplicationRecord
private
def field_id(field)
field.values_at('table', 'column').join('/')
end
def find_field(table, column)
fields.find { |c| c['table'] == table && c['column'] == column }
end