From ee2f795deced5742f81b26eac4f0162ce8d03bd0 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Tue, 14 Mar 2023 15:05:19 +0100 Subject: [PATCH] pr feedbacks - add validation for yes/no answer - improve locales use --- app/controllers/concerns/create_avis_concern.rb | 9 +++++++-- app/models/avis.rb | 1 + app/views/experts/avis/shared/_list.html.haml | 2 ++ app/views/instructeurs/avis/shared/_form.html.haml | 5 ++++- config/locales/models/avis/en.yml | 6 ++---- config/locales/models/avis/fr.yml | 6 ++---- .../controllers/instructeurs/dossiers_controller_spec.rb | 2 +- spec/system/experts/expert_spec.rb | 4 ++++ 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/controllers/concerns/create_avis_concern.rb b/app/controllers/concerns/create_avis_concern.rb index b1a55510c..270a3504d 100644 --- a/app/controllers/concerns/create_avis_concern.rb +++ b/app/controllers/concerns/create_avis_concern.rb @@ -5,8 +5,13 @@ module CreateAvisConcern def create_avis_from_params(dossier, instructeur_or_expert, confidentiel = false) if create_avis_params[:emails].empty? - flash.alert = t('activerecord.errors.models.email.empty') - return Avis.new(create_avis_params) + avis = Avis.new(create_avis_params) + errors = avis.errors + errors.add(:emails, :blank) + + flash.alert = errors.full_message(:emails, errors[:emails].first) + + return avis end confidentiel ||= create_avis_params[:confidentiel] diff --git a/app/models/avis.rb b/app/models/avis.rb index 95896fd97..cd8e7c532 100644 --- a/app/models/avis.rb +++ b/app/models/avis.rb @@ -43,6 +43,7 @@ class Avis < ApplicationRecord validates :email, format: { with: Devise.email_regexp, message: "n'est pas valide" }, allow_nil: true validates :claimant, presence: true + validates :question_answer, presence: { on: :update, if: -> { question_label.present? } } validates :piece_justificative_file, size: { less_than: FILE_MAX_SIZE } validates :introduction_file, size: { less_than: FILE_MAX_SIZE } before_validation -> { sanitize_email(:email) } diff --git a/app/views/experts/avis/shared/_list.html.haml b/app/views/experts/avis/shared/_list.html.haml index 56c4ae720..962d6813d 100644 --- a/app/views/experts/avis/shared/_list.html.haml +++ b/app/views/experts/avis/shared/_list.html.haml @@ -17,6 +17,8 @@ %span.date.fr-text--xs.fr-text-mention--grey{ class: highlight_if_unseen_class(avis_seen_at, avis.created_at) } = t('demande_envoyee_le', scope: 'views.shared.avis', date: l(avis.created_at, format: '%d/%m/%y à %H:%M')) %p= avis.introduction + - if avis.question_label + %p= avis.question_label .answer.flex.align-start %span.icon.bubble.avis-icon diff --git a/app/views/instructeurs/avis/shared/_form.html.haml b/app/views/instructeurs/avis/shared/_form.html.haml index 670252ab0..c8d66f1d1 100644 --- a/app/views/instructeurs/avis/shared/_form.html.haml +++ b/app/views/instructeurs/avis/shared/_form.html.haml @@ -26,7 +26,10 @@ = f.text_area :introduction, rows: 3, class: 'fr-input', value: avis.introduction || 'Bonjour, merci de me donner votre avis sur ce dossier.', required: true .fr-input-group - = f.label :question_label, t('helpers.label.question_label'), class: 'fr-label' + = f.label :question_label, class: 'fr-label' do + = t('helpers.label.question_label') + %span.fr-hint-text + = t('helpers.label.question_label_hint') = f.text_area :question_label, label: "question", class: 'fr-input' %p.tab-title Ajouter une pièce jointe .form-group diff --git a/config/locales/models/avis/en.yml b/config/locales/models/avis/en.yml index b98f6e414..df4e037d0 100644 --- a/config/locales/models/avis/en.yml +++ b/config/locales/models/avis/en.yml @@ -7,10 +7,7 @@ en: answer: "Answer" claimant: Claimant confidentiel: Confidential - errors: - models: - email: - empty: Email field can not be empty + question_answer: "Answer yes/no" helpers: label: invite_linked_dossiers: @@ -19,6 +16,7 @@ en: revoke: Revoke opinion request remind: Remind the expert question_label: Ask a question to the expert + question_label_hint: (optional field) the expert could answer by yes/no introduction: Introduction message question_answer: true: 'yes' diff --git a/config/locales/models/avis/fr.yml b/config/locales/models/avis/fr.yml index 527b82e1d..d0b4052eb 100644 --- a/config/locales/models/avis/fr.yml +++ b/config/locales/models/avis/fr.yml @@ -7,10 +7,7 @@ fr: answer: "Réponse" claimant: Demandeur confidentiel: confidentiel - errors: - models: - email: - empty: Le champ email ne peut pas être vide + question_answer: "Réponse oui/non" helpers: label: invite_linked_dossiers: @@ -19,6 +16,7 @@ fr: revoke: Révoquer la demande d’avis remind: Relancer l’expert question_label: Posez une question à l'expert + question_label_hint: (champ optionnel) l'expert pourra répondre par oui/non introduction: Message d'introduction question_answer: true: oui diff --git a/spec/controllers/instructeurs/dossiers_controller_spec.rb b/spec/controllers/instructeurs/dossiers_controller_spec.rb index 580f02b5f..971262fa9 100644 --- a/spec/controllers/instructeurs/dossiers_controller_spec.rb +++ b/spec/controllers/instructeurs/dossiers_controller_spec.rb @@ -634,7 +634,7 @@ describe Instructeurs::DossiersController, type: :controller do before { subject } it { expect(response).to render_template :avis } - it { expect(flash.alert).to eq("Le champ email ne peut pas être vide") } + it { expect(flash.alert).to eq("Le champ « Emails » doit être rempli") } it { expect { subject }.not_to change(Avis, :count) } it { expect(dossier.last_avis_updated_at).to eq(nil) } end diff --git a/spec/system/experts/expert_spec.rb b/spec/system/experts/expert_spec.rb index 623ab093b..b78d1de56 100644 --- a/spec/system/experts/expert_spec.rb +++ b/spec/system/experts/expert_spec.rb @@ -98,6 +98,10 @@ describe 'Inviting an expert:' do expect(page).to have_text('Question ?') expect(page).to have_text('Cet avis est confidentiel') + # check validation + click_on 'Envoyer votre avis' + expect(page).to have_content('Le champ « Réponse oui/non » doit être rempli') + choose 'oui' fill_in 'avis_answer', with: 'Ma réponse d’expert.' click_on 'Envoyer votre avis'