From 2295d643008feea5954651604be048aadbb9f156 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 20 Oct 2023 11:22:51 +0200 Subject: [PATCH] amelioration(dossier.pdf): pour les champs de type Champs::AddressChamp, ajoute le code insee de la commune sous l'adresse complete, ajoute le code postal, ajoute le departemenent et son code. Pour les champs de type Champs::CommuneChamp ajoute le code postal de la commune --- app/models/champs/address_champ.rb | 4 ++++ app/views/dossiers/show.pdf.prawn | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/champs/address_champ.rb b/app/models/champs/address_champ.rb index 7f8c87ae6..a9177b0c3 100644 --- a/app/models/champs/address_champ.rb +++ b/app/models/champs/address_champ.rb @@ -47,6 +47,10 @@ class Champs::AddressChamp < Champs::TextChamp APIGeoService.departement_name(address.fetch('department_code')) end + def departement_code_and_name + "#{address.fetch('department_code')} – #{departement_name}" + end + def departement if full_address? { code: address.fetch('department_code'), name: departement_name } diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn index 952bc4864..2c8048474 100644 --- a/app/views/dossiers/show.pdf.prawn +++ b/app/views/dossiers/show.pdf.prawn @@ -176,10 +176,19 @@ def add_single_champ(pdf, champ) when 'Champs::NumberChamp' value = champ.blank? ? 'Non communiqué' : number_with_delimiter(champ.to_s) format_in_2_lines(pdf, tdc.libelle, value) + when 'Champs::AddressChamp' + value = champ.blank? ? 'Non communiqué' : champ.to_s + format_in_2_lines(pdf, tdc.libelle, value) + if champ.full_address? + format_in_2_lines(pdf, "Code INSEE :", champ.commune&.fetch(:code)) + format_in_2_lines(pdf, "Code Postal :", champ.commune&.fetch(:postal_code)) + format_in_2_lines(pdf, "Département :", champ.departement_code_and_name) + end when 'Champs::CommuneChamp' value = champ.blank? ? 'Non communiqué' : champ.to_s format_in_2_lines(pdf, tdc.libelle, value) - pdf.text "Département : #{champ.departement_code_and_name}" if champ.departement? + format_in_2_lines(pdf, "Code Postal :", champ.code_postal) if champ.code_postal? + format_in_2_lines(pdf, "Département :", champ.departement_code_and_name) if champ.departement? else value = champ.blank? ? 'Non communiqué' : champ.to_s format_in_2_lines(pdf, tdc.libelle, value)