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

affiche Madame ou Monsieur

Browse source 
mais continue à enregistrer en base Mme ou M.
This commit is contained in:
Christophe Robillard 2020-12-08 21:30:54 +01:00
parent 2066e3db87
commit 23ae528c6b
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/individual.rb
View file

@ -19,8 +19,8 @@ class Individual < ApplicationRecord
validates :nom, presence: true, allow_blank: false, allow_nil: false, on: :update validates :nom, presence: true, allow_blank: false, allow_nil: false, on: :update
validates :prenom, presence: true, allow_blank: false, allow_nil: false, on: :update validates :prenom, presence: true, allow_blank: false, allow_nil: false, on: :update
GENDER_MALE = 'Monsieur' GENDER_MALE = "M."
GENDER_FEMALE = 'Madame' GENDER_FEMALE = 'Mme'
def self.from_france_connect(fc_information) def self.from_france_connect(fc_information)
new( new(

4
app/views/shared/dossiers/editable_champs/_civilite.html.haml
View file

@ -3,8 +3,8 @@
Sélectionnez une des valeurs Sélectionnez une des valeurs
%label %label
= form.radio_button :value, Individual::GENDER_FEMALE = form.radio_button :value, Individual::GENDER_FEMALE
= Individual::GENDER_FEMALE = t(Individual::GENDER_FEMALE, scope: 'activerecord.attributes.individual.gender_options')
%label %label
= form.radio_button :value, Individual::GENDER_MALE = form.radio_button :value, Individual::GENDER_MALE
= Individual::GENDER_MALE = t('activerecord.attributes.individual.gender_options')[Individual::GENDER_MALE.to_sym] # GENDER_MALE contains a point letter

4
app/views/users/dossiers/identite.html.haml
View file

@ -14,10 +14,10 @@
.radios .radios
%label %label
= f.radio_button :gender, Individual::GENDER_FEMALE, required: true = f.radio_button :gender, Individual::GENDER_FEMALE, required: true
= Individual::GENDER_FEMALE = t(Individual::GENDER_FEMALE, scope: 'activerecord.attributes.individual.gender_options')
%label %label
= f.radio_button :gender, Individual::GENDER_MALE, required: true = f.radio_button :gender, Individual::GENDER_MALE, required: true
= Individual::GENDER_MALE = t('activerecord.attributes.individual.gender_options')[Individual::GENDER_MALE.to_sym] # GENDER_MALE contains a point letter
.flex .flex
.inline-champ .inline-champ

3
config/locales/models/individual/fr.yml
View file

@ -6,3 +6,6 @@ fr:
nom: Nom nom: Nom
prenom: Prénom prenom: Prénom
birthdate: Date de naissance birthdate: Date de naissance
gender_options:
"Mme": "Madame"
"M." : "Monsieur"

2
spec/factories/individual.rb
View file

@ -1,6 +1,6 @@
FactoryBot.define do FactoryBot.define do
factory :individual do factory :individual do
gender { 'Monsieur' } gender { 'M.' }
nom { 'Julien' } nom { 'Julien' }
prenom { 'Xavier' } prenom { 'Xavier' }
birthdate { Date.new(1991, 11, 01) } birthdate { Date.new(1991, 11, 01) }

2
spec/features/users/brouillon_spec.rb
View file

@ -51,7 +51,7 @@ feature 'The user' do
expect(champ_value_for('datetime')).to eq('06/01/2030 07:05') expect(champ_value_for('datetime')).to eq('06/01/2030 07:05')
expect(champ_value_for('number')).to eq('42') expect(champ_value_for('number')).to eq('42')
expect(champ_value_for('checkbox')).to eq('on') expect(champ_value_for('checkbox')).to eq('on')
expect(champ_value_for('civilite')).to eq('Madame') expect(champ_value_for('civilite')).to eq('Mme')
expect(champ_value_for('email')).to eq('loulou@yopmail.com') expect(champ_value_for('email')).to eq('loulou@yopmail.com')
expect(champ_value_for('phone')).to eq('0123456789') expect(champ_value_for('phone')).to eq('0123456789')
expect(champ_value_for('yes_no')).to eq('false') expect(champ_value_for('yes_no')).to eq('false')