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

fix: can display contact_info nom on footer

Browse source
This commit is contained in:
Christophe Robillard 2023-09-27 12:09:00 +02:00
parent 1060aadff7
commit 6035a16ecc
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/contact_information.rb
View file

@ -9,6 +9,10 @@ class ContactInformation < ApplicationRecord
validates :adresse, presence: { message: 'doit être renseignée' }, allow_nil: false validates :adresse, presence: { message: 'doit être renseignée' }, allow_nil: false
validates :groupe_instructeur, presence: { message: 'doit être renseigné' }, allow_nil: false validates :groupe_instructeur, presence: { message: 'doit être renseigné' }, allow_nil: false
def pretty_nom
nom
end
def telephone_url def telephone_url
if telephone.present? if telephone.present?
"tel:#{telephone.gsub(/[[:blank:]]/, '')}" "tel:#{telephone.gsub(/[[:blank:]]/, '')}"

4
app/models/service.rb
View file

@ -25,6 +25,10 @@ class Service < ApplicationRecord
validates :adresse, presence: { message: 'doit être renseignée' }, allow_nil: false validates :adresse, presence: { message: 'doit être renseignée' }, allow_nil: false
validates :administrateur, presence: { message: 'doit être renseigné' }, allow_nil: false validates :administrateur, presence: { message: 'doit être renseigné' }, allow_nil: false
def pretty_nom
"#{nom}, #{organisme}"
end
def clone_and_assign_to_administrateur(administrateur) def clone_and_assign_to_administrateur(administrateur)
service_cloned = self.dup service_cloned = self.dup
service_cloned.administrateur = administrateur service_cloned.administrateur = administrateur

2
app/views/users/_procedure_footer.html.haml
View file

@ -7,7 +7,7 @@
- if service.present? - if service.present?
%h3.fr-footer__top-cat= I18n.t('users.procedure_footer.managed_by.header') %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.managed_by.header')
.fr-footer__top-link.fr-pb-2w .fr-footer__top-link.fr-pb-2w
%span{ lang: :fr }= "#{service.nom}, #{service.organisme}," %span{ lang: :fr }= service.pretty_nom
%div{ lang: :fr } %div{ lang: :fr }
= render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'}) = render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'})
%h3.fr-footer__top-cat= I18n.t('users.procedure_footer.contact.header') %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.contact.header')