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

Merge pull request #982 from sgmap/extended_motivation

Browse source 
[fix #873] add motivation in case of refused or without continuation …
This commit is contained in:
LeSim 2017-11-29 14:11:31 +01:00 committed by GitHub
commit 646fa0d83f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/new_design/state_button.js
View file

@ -1,9 +1,9 @@
TPS.acceptDossier = function () {
$(".motivation").show();
TPS.showMotivation = function (state) {
$(".motivation." + state).show();
$(".dropdown-items").hide();
}
};
TPS.motivationCancel = function () {
$(".motivation").hide();
$(".dropdown-items").show();
}
};

1
app/assets/stylesheets/new_design/motivation.scss
View file

@ -10,6 +10,7 @@
h3 {
font-size: 22px;
margin-bottom: $default-spacer * 2;
line-height: 1.5;
.icon {
vertical-align: sub;

40
app/views/new_gestionnaire/dossiers/_state_button.html.haml
View file

@ -28,36 +28,24 @@
.description
%h4 En instruction
L'usager ne peut modifier son dossier pendant l'instruction
%li{ onclick: "TPS.acceptDossier();" }
%li{ onclick: "TPS.showMotivation('accept');" }
.icon.accept
.description
%h4 Accepter
L'usager sera notifié que son dossier a été accepté
%li
= link_to backoffice_dossier_process_dossier_path(dossier, process_action: "without_continuation", new_ui: true), method: :post, data: { confirm: "Confirmer vous le classement sans suite de ce dossier ?" } do
.icon.without-continuation
.description
%h4 Classer sans suite
L'usager ne recevra aucune notification
%li
= link_to backoffice_dossier_process_dossier_path(dossier, process_action: "refuse", new_ui: true), method: :post, data: { confirm: "Confirmer vous le refus de ce dossier ?" } do
.icon.close
.description
%h4 Refuser
L'usager sera notifié que son dossier a été refusé
.motivation
%h3
.icon.accept
Accepter le dossier
= "nº #{dossier.id}"
= form_tag(backoffice_dossier_process_dossier_url(dossier.id, new_ui: true), method: :post, class: "form") do
= text_area :dossier, :motivation, class: "motivation-text-area", placeholder: "Rédigez votre motivation ici (facultative)"
%p.help
L'acceptation du dossier envoie automatiquement une attestation à l'usager.
.text-right
%span.button{ onclick: "TPS.motivationCancel();" } Annuler
= button_tag "Valider la décision", name: :process_action, value: "close", class: 'button primary', title: 'Accepter', data: { confirm: "Accepter ce dossier ?" }
%li{ onclick: "TPS.showMotivation('without-continuation');" }
.icon.without-continuation
.description
%h4 Classer sans suite
L'usager ne recevra aucune notification
%li{ onclick: "TPS.showMotivation('close');" }
.icon.close
.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: 'close', 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: 'without_continuation', 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: 'close', process_action: 'refuse', title: 'Refuser', confirm: 'Confirmer vous le refus de ce dossier ?' }
- else
- if dossier.motivation.present? || dossier.attestation.present?

13
app/views/new_gestionnaire/dossiers/_state_button_motivation.html.haml Normal file
View file

@ -0,0 +1,13 @@
.motivation{ class: popup_class }
%h3
.icon{ class: popup_class }
#{popup_title} nº #{dossier.id}
= form_tag(backoffice_dossier_process_dossier_url(dossier.id, new_ui: true), method: :post, class: 'form') do
= text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: 'Rédigez votre motivation ici (facultative)'
- if title == 'Accepter'
%p.help
L'acceptation du dossier envoie automatiquement une attestation à l'usager.
.text-right
%span.button{ onclick: 'TPS.motivationCancel();' } Annuler
= button_tag 'Valider la décision', name: :process_action, value: process_action, class: 'button primary', title: title, data: { confirm: confirm }

6
spec/features/new_gestionnaire/gestionnaire_spec.rb
View file

@ -23,8 +23,10 @@ feature 'The gestionnaire part' do
dossier.reload
expect(dossier.state).to eq('received')
fill_in('dossier_motivation', with: 'a good reason')
click_on 'Valider la décision'
within('.accept.motivation') do
fill_in('dossier_motivation', with: 'a good reason')
click_on 'Valider la décision'
end
dossier.reload
expect(dossier.state).to eq('closed')