diff --git a/app/assets/stylesheets/utils.scss b/app/assets/stylesheets/utils.scss index 72c8b8e4e..f0cd725c9 100644 --- a/app/assets/stylesheets/utils.scss +++ b/app/assets/stylesheets/utils.scss @@ -50,7 +50,9 @@ color: $black; } - +.text-sm { + font-size: 14px; +} .mt-1 { margin-top: $default-spacer; diff --git a/app/models/champs/commune_champ.rb b/app/models/champs/commune_champ.rb index 5f3ccdc05..6a53d1101 100644 --- a/app/models/champs/commune_champ.rb +++ b/app/models/champs/commune_champ.rb @@ -25,4 +25,25 @@ class Champs::CommuneChamp < Champs::TextChamp def for_export [value, external_id] end + + def name_departement + #FIXME we originaly saved already formatted departement with the code in the name + departement&.gsub(/^(.[0-9])\s-\s/, '') + end + + def departement_code_and_name + "#{code_departement} - #{name_departement}" + end + + def departement? + departement.present? + end + + def code? + code.present? + end + + def code + external_id + end end diff --git a/app/views/shared/champs/communes/_show.html.haml b/app/views/shared/champs/communes/_show.html.haml index 4a901ea30..a162917b4 100644 --- a/app/views/shared/champs/communes/_show.html.haml +++ b/app/views/shared/champs/communes/_show.html.haml @@ -1,4 +1,9 @@ = format_text_value(champ.to_s) -- if champ.external_id.present? - Code INSEE : - = champ.external_id +- if champ.code? + %p.text-sm + Code INSEE : + = champ.code + - if champ.departement? + %br + Departement : + = champ.departement_code_and_name