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

Merge pull request #481 from sgmap/add_inline_address_to_etablissement

Browse source 
Add inline address to etablissement
This commit is contained in:
LeSim 2017-06-27 11:28:54 +02:00 committed by GitHub
commit 03b735800b
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/attestation_template.rb
View file

@ -75,7 +75,7 @@ class AttestationTemplate < ApplicationRecord
end
def etablissement_tags
[{ libelle: 'adresse', description: '', target: 'adresse' }]
[{ libelle: 'adresse', description: '', target: 'inline_adresse' }]
end
def build_pdf(dossier)

5
app/models/etablissement.rb
View file

@ -9,4 +9,9 @@ class Etablissement < ActiveRecord::Base
def geo_adresse
[numero_voie, type_voie, nom_voie, complement_adresse, code_postal, localite].join(' ')
end
def inline_adresse
#squeeze needed because of space in excess in the data
"#{numero_voie} #{type_voie} #{nom_voie}, #{complement_adresse}, #{code_postal} #{localite}".squeeze(' ')
end
end

2
spec/models/attestation_template_spec.rb
View file

@ -159,7 +159,7 @@ describe AttestationTemplate, type: :model do
let(:etablissement) { create(:etablissement, adresse: 'adresse') }
let(:template_title) { '--adresse--' }
it { expect(view_args[:title]).to eq('adresse') }
it { expect(view_args[:title]).to eq(etablissement.inline_adresse) }
end
end
end

6
spec/models/etablissement_spec.rb
View file

@ -29,4 +29,10 @@ describe Etablissement do
it { is_expected.to eq '6 RUE RAOUL NORDLING IMMEUBLE BORA 92270 BOIS COLOMBES' }
end
describe '#inline_adresse' do
let(:etablissement) { create(:etablissement, nom_voie: 'green moon') }
it { expect(etablissement.inline_adresse).to eq '6 RUE green moon, IMMEUBLE BORA, 92270 BOIS COLOMBES' }
end
end