Skip to content

Commit

Permalink
[Fix #963] Add a "personnes impliquées" tab
Browse files Browse the repository at this point in the history
  • Loading branch information
gregoirenovel committed Dec 5, 2017
1 parent 407a788 commit d75a387
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 0 deletions.
8 changes: 8 additions & 0 deletions app/assets/stylesheets/new_design/personnes_impliquees.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.personnes-impliquees {
padding-bottom: 50px;

ul {
list-style-type: disc;
margin-left: 16px;
}
}
6 changes: 6 additions & 0 deletions app/controllers/new_gestionnaire/dossiers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ def avis
current_gestionnaire.mark_tab_as_seen(dossier, :avis)
end

def personnes_impliquees
@following_accompagnateurs_emails = dossier.followers_gestionnaires.pluck(:email)
@avis_emails = dossier.avis.includes(:gestionnaire).map(&:email_to_display)
@invites_emails = dossier.invites.map(&:email)
end

def follow
current_gestionnaire.follow(dossier)
dossier.next_step!('gestionnaire', 'follow')
Expand Down
2 changes: 2 additions & 0 deletions app/views/new_gestionnaire/dossiers/_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
- if notifications_summary[:messagerie]
%span.notifications{ 'aria-label': 'notifications' }
= link_to "Messagerie", messagerie_dossier_path(dossier.procedure, dossier)
%li{ class: current_page?(personnes_impliquees_dossier_path(dossier.procedure, dossier)) ? 'active' : nil }
= link_to "Personnes impliquées", personnes_impliquees_dossier_path(dossier.procedure, dossier)

.container
.print-header
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.accompagnateur-title= title

- if emails_collection.present?
%ul
- emails_collection.each do |email|
%li
= email
- else
= blank
10 changes: 10 additions & 0 deletions app/views/new_gestionnaire/dossiers/personnes_impliquees.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- content_for(:title, "Personnes impliquées · Dossier nº #{@dossier.id} (#{@dossier.owner_name})")

= render partial: "header", locals: { dossier: @dossier }

.personnes-impliquees.container
= render partial: 'new_gestionnaire/dossiers/personnes_impliquees_block', locals: { emails_collection: @following_accompagnateurs_emails, title: "Accompagnateurs qui suivent le dossier", blank: "Aucun accompagnateur ne suit ce dossier" }

= render partial: 'new_gestionnaire/dossiers/personnes_impliquees_block', locals: { emails_collection: @avis_emails, title: "Personnes à qui un avis a été demandé", blank: "Aucun avis n'a été demandé" }

= render partial: 'new_gestionnaire/dossiers/personnes_impliquees_block', locals: { emails_collection: @invites_emails, title: "Personnes invitées à consulter ce dossier", blank: "Aucune personne n'a été invitée à consulter ce dossier" }
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@
get 'messagerie'
get 'annotations-privees' => 'dossiers#annotations_privees'
get 'avis'
get 'personnes-impliquees' => 'dossiers#personnes_impliquees'
patch 'follow'
patch 'unfollow'
patch 'archive'
Expand Down
23 changes: 23 additions & 0 deletions spec/features/new_gestionnaire/gestionnaire_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,29 @@
expect(page).to have_text('a great answer')
end

scenario 'A gestionnaire can see the personnes impliquées' do
gestionnaire2 = FactoryGirl.create(:gestionnaire, password: password)

log_in(gestionnaire.email, password)

click_on 'nouvelle interface'
click_on procedure.libelle
click_on dossier.user.email

click_on 'Avis externes'
expect(page).to have_current_path(avis_dossier_path(procedure, dossier))

expert_email = '[email protected]'
ask_confidential_avis(expert_email, 'a good introduction')

expert_email = gestionnaire2.email
ask_confidential_avis(expert_email, 'a good introduction')

click_on 'Personnes impliquées'
expect(page).to have_text(expert_email)
expect(page).to have_text(gestionnaire2.email)
end

def log_in(email, password)
visit '/'
click_on 'Connexion'
Expand Down

0 comments on commit d75a387

Please sign in to comment.