dossier: display latest message on summary page

This commit is contained in:
Pierre de La Morinerie 2018-09-11 18:40:10 +02:00 committed by gregoirenovel
parent 968952ff46
commit 926dc3e107
8 changed files with 64 additions and 4 deletions

View file

@ -38,4 +38,15 @@
.messagerie-explanation {
margin-bottom: $default-padding * 2;
}
.latest-message-section {
display: flex;
flex-direction: column;
max-width: 700px;
margin-bottom: $default-padding * 2;
.button.send {
align-self: flex-end;
}
}
}

View file

@ -9,6 +9,10 @@
background: #FFFFFF;
border-radius: 3px;
&.inverted-background {
background: $light-grey;
}
.person-icon {
margin-right: $default-spacer;
}

View file

@ -3,6 +3,7 @@
.status-overview {
text-align: center;
margin-bottom: $default-padding * 2;
}
.status-timeline {

View file

@ -5,6 +5,14 @@ module CommentaireHelper
end
end
def commentaire_answer_action(commentaire, connected_user)
if commentaire_is_from_me(commentaire, connected_user)
"Envoyer un message à linstructeur"
else
"Répondre dans la messagerie"
end
end
def commentaire_is_from_guest(commentaire)
commentaire.dossier.invites.map(&:email).include?(commentaire.email)
end

View file

@ -5,3 +5,13 @@
.container
= render partial: 'new_user/dossiers/show/status_overview', locals: { dossier: @dossier }
- latest_message = @dossier.commentaires.last
- if latest_message.present?
.latest-message-section
%h3.tab-title Dernier message
.message.inverted-background
= render partial: "shared/dossiers/messages/message", locals: { commentaire: latest_message, connected_user: current_user, messagerie_seen_at: nil }
= link_to commentaire_answer_action(latest_message, current_user), messagerie_dossier_url(@dossier, anchor: 'new_commentaire'), class: 'button send'

View file

@ -4,7 +4,7 @@ describe 'Dossier details:' do
tdcs = [create(:type_de_champ, libelle: 'texte obligatoire')]
create(:procedure, :published, :for_individual, types_de_champ: tdcs)
end
let(:dossier) { create(:dossier, :en_construction, :for_individual, user: user, procedure: simple_procedure) }
let(:dossier) { create(:dossier, :en_construction, :for_individual, :with_commentaires, user: user, procedure: simple_procedure) }
before do
Flipflop::FeatureSet.current.test!.switch!(:new_dossier_details, true)
@ -16,6 +16,7 @@ describe 'Dossier details:' do
expect(page).to have_current_path(dossier_path(dossier))
expect(page).to have_content(dossier.id)
expect(page).to have_selector('.status-explanation')
expect(page).to have_text(dossier.commentaires.last.body)
end
scenario 'the user can see and edit dossier before instruction' do

View file

@ -7,16 +7,30 @@ RSpec.describe CommentaireHelper, type: :helper do
subject { commentaire_is_from_me_class(commentaire, me) }
context "when commentaire is from me" do
let(:me) { "michel@pref.fr" }
let(:me) { User.new(email: "michel@pref.fr") }
it { is_expected.to eq("from-me") }
end
context "when commentaire is not from me" do
let(:me) { "roger@usager.fr" }
let(:me) { User.new(email: "roger@usager.fr") }
it { is_expected.to eq nil }
end
end
describe '.commentaire_answer_action' do
subject { commentaire_answer_action(commentaire, me) }
context "when commentaire is from me" do
let(:me) { User.new(email: "michel@pref.fr") }
it { is_expected.to include('Envoyer') }
end
context "when commentaire is not from me" do
let(:me) { User.new(email: "roger@usager.fr") }
it { is_expected.to include('Répondre') }
end
end
describe '.commentaire_is_from_guest' do
let(:dossier) { create(:dossier) }
let!(:guest) { create(:invite_user, dossier: dossier) }

View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe 'new_user/dossiers/show.html.haml', type: :view do
let(:dossier) { create(:dossier, :en_construction, procedure: create(:procedure)) }
let(:dossier) { create(:dossier, :en_construction) }
before do
sign_in dossier.user
@ -14,4 +14,15 @@ describe 'new_user/dossiers/show.html.haml', type: :view do
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_selector('.status-overview')
end
context 'with messages' do
let(:first_message) { create(:commentaire, body: 'Premier message') }
let(:last_message) { create(:commentaire, body: 'Second message') }
let(:dossier) { create(:dossier, :en_construction, commentaires: [first_message, last_message]) }
it 'displays the last message' do
expect(rendered).not_to have_text(first_message.body)
expect(rendered).to have_text(last_message.body)
end
end
end