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

Dossier: rename data_with_champs to to_sorted_values

Browse source
This commit is contained in:
Simon Lehericey 2017-10-26 16:37:10 +02:00
parent f0373f6bc2
commit 3f2419a2a3
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/dossier.rb
View file

@ -232,7 +232,7 @@ class Dossier < ActiveRecord::Base
end
def full_data_strings_array
data_with_champs.map do |value|
to_sorted_values.map do |value|
serialize_value_for_export(value)
end
end
@ -248,13 +248,13 @@ class Dossier < ActiveRecord::Base
convert_specific_hash_values_to_string(etablissement_attr.merge(entreprise_attr))
end
def data_with_champs
def to_sorted_values
serialized_dossier = DossierTableExportSerializer.new(self)
data = serialized_dossier.attributes.values
data += self.ordered_champs.map(&:value)
data += self.ordered_champs_private.map(&:value)
data += self.export_entreprise_data.values
data
values = serialized_dossier.attributes.values
values += self.ordered_champs.map(&:value)
values += self.ordered_champs_private.map(&:value)
values += self.export_entreprise_data.values
values
end
def export_headers