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

Merge pull request #9451 from demarches-simplifiees/DSFR/civilite

Browse source 
ETQ Usager, je veux voir le champ Civilite au DSFR
This commit is contained in:
Kara Diaby 2023-09-06 11:07:52 +00:00 committed by GitHub
commit 3cddd0cb41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/components/editable_champ/civilite_component/civilite_component.html.haml
View file

@ -1,10 +1,13 @@
%fieldset.radios
%legend.mandatory-explanation
%fieldset.fr-fieldset
%legend.fr-fieldset__legend--regular.fr-fieldset__legend
Sélectionnez une des valeurs
%label
= @form.radio_button :value, Individual::GENDER_FEMALE, id: @champ.female_input_id
= Individual.human_attribute_name('gender.female')
%label
= @form.radio_button :value, Individual::GENDER_MALE, id: @champ.male_input_id
= Individual.human_attribute_name('gender.male')
.fr-fieldset__element.fr-fieldset__element--inline
.fr-radio-group
= @form.radio_button :value, Individual::GENDER_FEMALE, id: @champ.female_input_id
%label.fr-label{ for: @champ.female_input_id }
= Individual.human_attribute_name('gender.female')
.fr-fieldset__element.fr-fieldset__element--inline
.fr-radio-group
= @form.radio_button :value, Individual::GENDER_MALE, id: @champ.male_input_id
%label.fr-label{ for: @champ.male_input_id }
= Individual.human_attribute_name('gender.male')

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

@ -10,28 +10,32 @@
%p.fr-hint-text.fr-mb-3w= t('views.users.dossiers.identite.all_required')
%fieldset
%legend
%fieldset.fr-fieldset
%legend.fr-fieldset__legend--regular.fr-fieldset__legend
= f.label :gender, t('activerecord.attributes.individual.gender')
.radios
%label
= f.radio_button :gender, Individual::GENDER_FEMALE, required: true
= Individual.human_attribute_name('gender.female')
%label
= f.radio_button :gender, Individual::GENDER_MALE, required: true
= Individual.human_attribute_name('gender.male')
.fr-fieldset__element.fr-fieldset__element--inline
.fr-radio-group
= f.radio_button :gender, Individual::GENDER_FEMALE, required: true, id: "identite_champ_radio_#{Individual::GENDER_FEMALE}"
%label.fr-label{ for: "identite_champ_radio_#{Individual::GENDER_FEMALE}" }
= Individual.human_attribute_name('gender.female')
.fr-fieldset__element.fr-fieldset__element--inline
.fr-radio-group
= f.radio_button :gender, Individual::GENDER_MALE, required: true, id: "identite_champ_radio_#{Individual::GENDER_MALE}"
%label.fr-label{ for: "identite_champ_radio_#{Individual::GENDER_MALE}" }
= Individual.human_attribute_name('gender.male')
.flex
.inline-champ
= f.label :prenom
= f.text_field :prenom, class: "small", required: true, autocomplete: 'given-name'
= f.label :prenom, for: 'identite_champ_first_name', class: 'fr-label'
= f.text_field :prenom, class: 'fr-input', required: true, autocomplete: 'given-name', id: 'identite_champ_first_name'
.inline-champ
= f.label :nom
= f.text_field :nom, class: "small", required: true, autocomplete: 'family-name'
= f.label :nom, class: 'fr-label', for: 'identite_champ_last_name'
= f.text_field :nom, class: "fr-input", required: true, autocomplete: 'family-name', id: 'identite_champ_last_name'
- if @dossier.procedure.ask_birthday?
= f.label :birthdate
= f.date_field :birthdate, value: @dossier.individual.birthdate, placeholder: 'format : AAAA-MM-JJ', required: true, class: "small"
.fr-input-group
= f.label :birthdate, class: "fr-label", for: 'identite_champ_birthdate'
= f.date_field :birthdate, value: @dossier.individual.birthdate, placeholder: 'format : AAAA-MM-JJ', required: true, class: "fr-input", "aria-describedby" => "identite-champ-date-birthday", id: 'identite_champ_birthdate'
= f.submit t('views.users.dossiers.identite.continue'), class: "fr-btn fr-btn--lg fr-mt-4w"

6
spec/system/accessibilite/wcag_usager_spec.rb
View file

@ -109,9 +109,9 @@ describe 'wcag rules for usager', js: true, retry: 3 do
scenario "dépot d'un dossier" do
click_on 'Commencer la démarche'
choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom')
find('label', text: 'Monsieur')
fill_in('identite_champ_first_name', with: 'prenom')
fill_in('identite_champ_last_name', with: 'nom')
click_on 'Continuer'
expect(page).to be_axe_clean

24
spec/system/api_particulier/api_particulier_spec.rb
View file

@ -266,9 +266,9 @@ describe 'fetch API Particulier Data', js: true, retry: 3 do
visit commencer_path(path: procedure.path)
click_on 'Commencer la démarche'
choose 'Monsieur'
fill_in 'individual_nom', with: 'Nom'
fill_in 'individual_prenom', with: 'Prenom'
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'prenom')
fill_in('identite_champ_last_name', with: 'nom')
click_button('Continuer')
@ -325,9 +325,9 @@ describe 'fetch API Particulier Data', js: true, retry: 3 do
visit commencer_path(path: procedure.path)
click_on 'Commencer la démarche'
choose 'Monsieur'
fill_in 'individual_nom', with: 'Moustaki'
fill_in 'individual_prenom', with: 'Georges'
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'Georges')
fill_in('identite_champ_last_name', with: 'Moustaki')
click_button('Continuer')
@ -399,9 +399,9 @@ describe 'fetch API Particulier Data', js: true, retry: 3 do
visit commencer_path(path: procedure.path)
click_on 'Commencer la démarche'
choose 'Madame'
fill_in 'individual_nom', with: 'Dubois'
fill_in 'individual_prenom', with: 'Angela Claire Louise'
find('label[for="identite_champ_radio_Mme"]').click
fill_in('identite_champ_last_name', with: 'Dubois')
fill_in('identite_champ_first_name', with: 'Angela Claire Louise')
click_button('Continuer')
@ -463,9 +463,9 @@ describe 'fetch API Particulier Data', js: true, retry: 3 do
visit commencer_path(path: procedure.path)
click_on 'Commencer la démarche'
choose 'Madame'
fill_in 'individual_nom', with: 'FERRI'
fill_in 'individual_prenom', with: 'Karine'
find('label[for="identite_champ_radio_Mme"]').click
fill_in('identite_champ_last_name', with: 'FERRI')
fill_in('identite_champ_first_name', with: 'Karine')
click_button('Continuer')

6
spec/system/routing/rules_full_scenario_spec.rb
View file

@ -262,9 +262,9 @@ describe 'The routing with rules', js: true, retry: 3 do
visit commencer_path(path: procedure.reload.path)
click_on 'Commencer la démarche'
choose 'Monsieur'
fill_in 'individual_nom', with: 'Nom'
fill_in 'individual_prenom', with: 'Prenom'
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'Prenom')
fill_in('identite_champ_last_name', with: 'Nom')
click_button('Continuer')
# the old system should not be present

7
spec/system/users/brouillon_spec.rb
View file

@ -10,7 +10,6 @@ describe 'The user' do
log_in(user, procedure)
fill_individual
# fill data
fill_in('text', with: 'super texte', match: :first)
fill_in('textarea', with: 'super textarea')
@ -22,7 +21,7 @@ describe 'The user' do
fill_in('integer_number', with: '12')
scroll_to(find_field('checkbox'), align: :center)
find('label', text: 'checkbox').click
choose('Madame')
find('label', text: 'Madame').click
fill_in('email', with: 'loulou@yopmail.com')
fill_in('phone', with: '0123456789')
scroll_to(find_field('Non'), align: :center)
@ -556,8 +555,8 @@ describe 'The user' do
def fill_individual
find('label', text: 'Monsieur').click
fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom')
fill_in('identite_champ_first_name', with: 'prenom')
fill_in('identite_champ_last_name', with: 'nom')
click_on 'Continuer'
expect(page).to have_current_path(brouillon_dossier_path(user_dossier))
end

8
spec/system/users/dossier_creation_spec.rb
View file

@ -21,9 +21,9 @@ describe 'Creating a new dossier:' do
expect(page).to have_current_path identite_dossier_path(user.reload.dossiers.last)
expect(page).to have_title(libelle)
choose 'Monsieur'
fill_in 'individual_nom', with: 'Nom'
fill_in 'individual_prenom', with: 'Prenom'
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'Prenom')
fill_in('identite_champ_last_name', with: 'Nom')
end
shared_examples 'the user can create a new draft' do
@ -41,7 +41,7 @@ describe 'Creating a new dossier:' do
let(:expected_birthday) { Date.new(1987, 10, 14) }
before do
fill_in 'individual_birthdate', with: birthday_format
fill_in 'identite_champ_birthdate', with: birthday_format
end
context 'when the browser supports `type=date` input fields' do

6
spec/system/users/dropdown_spec.rb
View file

@ -74,9 +74,9 @@ describe 'dropdown list with other option activated', js: true, retry: 3 do
private
def fill_individual
choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom')
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'prenom')
fill_in('identite_champ_last_name', with: 'nom')
click_on 'Continuer'
expect(page).to have_current_path(brouillon_dossier_path(user_dossier))
end

6
spec/system/users/linked_dropdown_spec.rb
View file

@ -80,9 +80,9 @@ describe 'linked dropdown lists' do
end
def fill_individual
choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom')
find('label', text: 'Monsieur').click
fill_in('identite_champ_first_name', with: 'prenom')
fill_in('identite_champ_last_name', with: 'nom')
click_on 'Continuer'
expect(page).to have_current_path(brouillon_dossier_path(user_dossier))
end