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

Order types de champ in scope

Browse source
This commit is contained in:
Paul Chavard 2018-12-20 12:00:27 +01:00
parent bf8fa41020
commit eb9edc1cee
6 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/procedure_export_service.rb
View file

@ -142,10 +142,10 @@ class ProcedureExportService
headers = ATTRIBUTES.map do |key|
label_for_export(key.to_s)
end
headers += @procedure.types_de_champ.ordered.reject(&:exclude_from_export?).map do |champ|
headers += @procedure.types_de_champ.reject(&:exclude_from_export?).map do |champ|
label_for_export(champ.libelle)
end
headers += @procedure.types_de_champ_private.ordered.reject(&:exclude_from_export?).map do |champ|
headers += @procedure.types_de_champ_private.reject(&:exclude_from_export?).map do |champ|
label_for_export(champ.libelle)
end
headers += ETABLISSEMENT_ATTRIBUTES.map do |key|

2
app/services/types_de_champ_service.rb
View file

@ -36,7 +36,7 @@ class TypesDeChampService
end
def types_de_champ
private? ? @procedure.types_de_champ_private_ordered.decorate : @procedure.types_de_champ_ordered.decorate
private? ? @procedure.types_de_champ_private.decorate : @procedure.types_de_champ.decorate
end
def new_type_de_champ