From 85a01a463800a72c1a600fe554a9e2802fa83500 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 21 Dec 2017 15:27:20 +0100 Subject: [PATCH 1/2] Fix typos and unify the wording for dossier processing --- app/views/new_gestionnaire/dossiers/_state_button.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/new_gestionnaire/dossiers/_state_button.html.haml b/app/views/new_gestionnaire/dossiers/_state_button.html.haml index 1314b8d3e..bbae9efb8 100644 --- a/app/views/new_gestionnaire/dossiers/_state_button.html.haml +++ b/app/views/new_gestionnaire/dossiers/_state_button.html.haml @@ -43,9 +43,9 @@ .description %h4 Refuser L'usager sera notifié que son dossier a été refusé - = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: 'Accepter ce dossier ?' } - = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmer vous le classement sans suite de ce dossier ?' } - = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmer vous le refus de ce dossier ?' } + = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" } + = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmez-vous le classement sans suite de ce dossier ?' } + = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' } - else - if dossier.motivation.present? || dossier.attestation.present? From a55463c164fae3b0ad37e04db75349d3adf50c3d Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 21 Dec 2017 15:29:29 +0100 Subject: [PATCH 2/2] Remove the dossier number from the dossier processing popover MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - One popup_title wasn’t written so that its combination with the dossier number made sense - The number is already visible on the page - The number is not that important to make a decision (the context it adds does not have so much value) --- .../dossiers/_state_button_motivation.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/new_gestionnaire/dossiers/_state_button_motivation.html.haml b/app/views/new_gestionnaire/dossiers/_state_button_motivation.html.haml index 80ccb2f0d..c7e38f8f0 100644 --- a/app/views/new_gestionnaire/dossiers/_state_button_motivation.html.haml +++ b/app/views/new_gestionnaire/dossiers/_state_button_motivation.html.haml @@ -1,7 +1,7 @@ .motivation{ class: popup_class } %h3 %span.icon{ class: popup_class } - #{popup_title} nº #{dossier.id} + #{popup_title} = form_tag(terminer_dossier_path(dossier.procedure, dossier), method: :post, class: 'form') do = text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: 'Rédigez votre motivation ici (facultative)'