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

dossier pdf: display form fields in two columns (instead of 2 lines)

Browse source 
Identity fields are displayed on two columns, but until now Dossier
fields were displayed on two lines.

This was because of a bug in format_in_2_columns, where the multiple-
lines fields were not handled properly.

This has been fixed a while back by @maatinito, so we can now enable
two-columns formatting even for Dossier fields.
This commit is contained in:
maatinito 2021-03-23 14:04:45 +00:00 committed by Pierre de La Morinerie
parent a580b7daf9
commit a29fb5cc5b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/dossiers/show.pdf.prawn
View file

@ -93,9 +93,9 @@ def render_single_champ(pdf, champ)
end end
pdf.text "\n" pdf.text "\n"
when 'Champs::ExplicationChamp' when 'Champs::ExplicationChamp'
format_in_2_lines(pdf, champ.libelle, champ.description) format_in_2_columns(pdf, champ.libelle, champ.description)
when 'Champs::CarteChamp' when 'Champs::CarteChamp'
format_in_2_lines(pdf, champ.libelle, champ.to_feature_collection.to_json) format_in_2_columns(pdf, champ.libelle, champ.to_feature_collection.to_json)
when 'Champs::SiretChamp' when 'Champs::SiretChamp'
pdf.font 'marianne', style: :bold, size: 9 do pdf.font 'marianne', style: :bold, size: 9 do
pdf.text champ.libelle pdf.text champ.libelle
@ -105,10 +105,10 @@ def render_single_champ(pdf, champ)
pdf.text "\n" pdf.text "\n"
when 'Champs::NumberChamp' when 'Champs::NumberChamp'
value = number_with_delimiter(champ.to_s) value = number_with_delimiter(champ.to_s)
format_in_2_lines(pdf, champ.libelle, value) format_in_2_columns(pdf, champ.libelle, value)
else else
value = champ.to_s.empty? ? 'Non communiqué' : champ.to_s value = champ.to_s.empty? ? 'Non communiqué' : champ.to_s
format_in_2_lines(pdf, champ.libelle, value) format_in_2_columns(pdf, champ.libelle, value)
end end
end end
@ -181,7 +181,7 @@ prawn_document(page_size: "A4") do |pdf|
pdf.text "Ce dossier est <b>#{dossier_display_state(@dossier, lower: true)}</b>.", inline_format: true pdf.text "Ce dossier est <b>#{dossier_display_state(@dossier, lower: true)}</b>.", inline_format: true
pdf.text "\n" pdf.text "\n"
if @dossier.motivation.present? if @dossier.motivation.present?
format_in_2_lines(pdf, "Motif de la décision", @dossier.motivation) format_in_2_columns(pdf, "Motif de la décision", @dossier.motivation)
end end
add_title(pdf, 'Historique') add_title(pdf, 'Historique')
add_etats_dossier(pdf, @dossier) add_etats_dossier(pdf, @dossier)