show which instructeur took decision and when
and also replace "sans suite" by "classé sans suite"
This commit is contained in:
parent
cea170e4a6
commit
8f9d6d2871
4 changed files with 10 additions and 4 deletions
|
@ -5,6 +5,9 @@
|
|||
.personnes-impliquees.container
|
||||
= render partial: 'instructeurs/dossiers/envoyer_dossier_block', locals: { dossier: @dossier, potential_recipients: @potential_recipients }
|
||||
|
||||
- @dossier.traitements.each do |traitement|
|
||||
= render partial: 'instructeurs/dossiers/personnes_impliquees_block', locals: { emails_collection: [traitement.instructeur.email], title: "Instructeur qui a #{t(traitement.state, scope: 'activerecord.attributes.traitement.state').downcase} le dossier (#{l(traitement.processed_at)})" }
|
||||
|
||||
= render partial: 'instructeurs/dossiers/personnes_impliquees_block', locals: { emails_collection: @following_instructeurs_emails, title: "Instructeurs qui suivent actuellement le dossier", blank: "Aucun instructeur ne suit ce dossier" }
|
||||
|
||||
- if @previous_following_instructeurs_emails.present?
|
||||
|
|
|
@ -9,13 +9,13 @@ fr:
|
|||
montant_projet: 'Le montant du projet'
|
||||
montant_aide_demande: "Le montant d’aide demandée"
|
||||
date_previsionnelle: "La date de début prévisionnelle"
|
||||
state:
|
||||
state: &state
|
||||
brouillon: "Brouillon"
|
||||
en_construction: "En construction"
|
||||
en_instruction: "En instruction"
|
||||
accepte: "Accepté"
|
||||
refuse: "Refusé"
|
||||
sans_suite: "Sans suite"
|
||||
sans_suite: "Classé sans suite"
|
||||
autorisation_donnees: Acceptation des CGU
|
||||
state/brouillon: Brouillon
|
||||
state/en_construction: En construction
|
||||
|
@ -23,3 +23,6 @@ fr:
|
|||
state/accepte: Accepté
|
||||
state/refuse: Refusé
|
||||
state/sans_suite: Sans suite
|
||||
traitement:
|
||||
state:
|
||||
<<: *state
|
||||
|
|
|
@ -596,7 +596,7 @@ describe API::V2::GraphqlController do
|
|||
it "should fail" do
|
||||
expect(gql_errors).to eq(nil)
|
||||
expect(gql_data).to eq(dossierRefuser: {
|
||||
errors: [{ message: "Le dossier est déjà sans suite" }],
|
||||
errors: [{ message: "Le dossier est déjà classé sans suite" }],
|
||||
dossier: nil
|
||||
})
|
||||
end
|
||||
|
|
|
@ -156,7 +156,7 @@ RSpec.describe DossierHelper, type: :helper do
|
|||
|
||||
it 'sans_suite is traité' do
|
||||
dossier.sans_suite!
|
||||
expect(subject).to eq('Sans suite')
|
||||
expect(subject).to eq('Classé sans suite')
|
||||
end
|
||||
|
||||
it 'refuse is traité' do
|
||||
|
|
Loading…
Add table
Reference in a new issue