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

Merge pull request #9957 from demarches-simplifiees/finalize-rna-rnf-ldu

Browse source 
ETQ instructeur et consommateur API, la vue du champ RNA est harmonisée avec le champ RNF
This commit is contained in:
Colin Darie 2024-02-14 15:30:54 +00:00 • committed by GitHub
commit bd3c2c070a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 173 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/models/champs/rna_champ.rb
View file

@ -22,4 +22,25 @@ class Champs::RNAChamp < Champ
def search_terms
etablissement.present? ? etablissement.search_terms : [value]
end
def full_address
address = data&.dig("adresse")
return if address.blank?
"#{address["numero_voie"]} #{address["type_voie"]} #{address["libelle_voie"]} #{address["code_postal"]} #{address["commune"]}"
end
def rna_address
address = data&.dig("adresse")
return if address.blank?
{
label: full_address,
type: "housenumber",
street_address: address["libelle_voie"] ? [address["numero_voie"], address["type_voie"], address["libelle_voie"]].compact.join(' ') : nil,
street_number: address["numero_voie"],
street_name: [address["type_voie"], address["libelle_voie"]].compact.join(' '),
postal_code: address["code_postal"],
city_name: address["commune"],
city_code: address["code_insee"]
}
end
end

6
app/models/champs/rnf_champ.rb
View file

@ -109,4 +109,10 @@ class Champs::RNFChamp < Champ
}
end
end
def full_address
if address.present?
address['label']
end
end
end