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

Merge branch 'dev'

Browse source
This commit is contained in:
gregoirenovel 2018-09-12 09:30:48 +02:00
commit ff9ab0cc32
19 changed files with 100 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/assets/stylesheets/new_design/new_footer.scss
View file

@ -15,7 +15,7 @@ footer {
}
.dossier-footer {
@include vertical-padding(48px);
@include vertical-padding(30px);
line-height: 24px;
}
@ -32,11 +32,10 @@ footer {
flex-grow: 1;
min-width: 280px;
margin: 0 20px;
margin-bottom: 20px;
margin-bottom: 30px;
@media (max-width: 1000px) {
@media (max-width: 550px) {
width: 100%;
margin-bottom: 14px;
}
}
@ -98,8 +97,23 @@ footer {
}
.footer-bottom-line {
margin-top: 30px;
margin-bottom: -30px;
text-align: center;
font-size: small;
@media (max-width: 550px) {
text-align: left;
}
}
.footer-row {
margin-bottom: 30px;
&:last-child {
margin-bottom: 0;
}
// In this case, the bottom margin is defined directly on each individual column
&.footer-columns {
margin-bottom: 0;
}
}

6
app/assets/stylesheets/new_design/personnes_impliquees.scss
View file

@ -5,4 +5,10 @@
list-style-type: disc;
margin-left: 16px;
}
// scss-lint:disable SelectorFormat
.form .select2-container .select2-selection__rendered {
padding: 12px;
}
// scss-lint:enable
}

10
app/controllers/new_gestionnaire/dossiers_controller.rb
View file

@ -37,9 +37,13 @@ module NewGestionnaire
@potential_recipients = procedure.gestionnaires.reject { |g| g == current_gestionnaire }
end
def envoyer_a_instructeur
recipient = Gestionnaire.find(params[:recipient])
GestionnaireMailer.send_dossier(current_gestionnaire, dossier, recipient).deliver_later
def send_to_instructeurs
recipients = Gestionnaire.find(params[:recipients])
recipients.each do |recipient|
GestionnaireMailer.send_dossier(current_gestionnaire, dossier, recipient).deliver_later
end
flash.notice = "Dossier envoyé"
redirect_to(personnes_impliquees_gestionnaire_dossier_path(procedure, dossier))
end

9
app/javascript/new_design/select2.js
View file

@ -7,10 +7,17 @@ addEventListener('turbolinks:load', () => {
width: '100%'
});
$('select.select2-limited').select2({
$('.columns-form select.select2-limited').select2({
language: 'fr',
placeholder: 'Sélectionnez des colonnes',
maximumSelectionLength: '5',
width: '300px'
});
$('.recipients-form select.select2-limited').select2({
language: 'fr',
placeholder: 'Sélectionnez des instructeurs',
maximumSelectionLength: '30',
width: '300px'
});
});

2
app/views/new_gestionnaire/avis/messagerie.html.haml
View file

@ -2,4 +2,4 @@
= render partial: 'header', locals: { avis: @avis, dossier: @dossier }
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, user_email: current_gestionnaire.email, messagerie_seen_at: nil, new_commentaire: @commentaire, form_url: commentaire_gestionnaire_avis_path(@avis) }
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, connected_user: current_gestionnaire, messagerie_seen_at: nil, new_commentaire: @commentaire, form_url: commentaire_gestionnaire_avis_path(@avis) }

10
app/views/new_gestionnaire/dossiers/_envoyer_dossier_block.html.haml
View file

@ -4,7 +4,11 @@
%p.tab-paragraph
Vous êtes le seul instructeur assigné sur cette démarche
- else
= form_for dossier, url: envoyer_a_instructeur_gestionnaire_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form' } do |f|
.flex.justify-start.align-baseline
= select_tag(:recipient, options_from_collection_for_select(potential_recipients, :id, :email))
= form_for dossier, url: send_to_instructeurs_gestionnaire_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form recipients-form' } do |f|
.flex.justify-start.align-start
= select_tag(:recipients,
options_from_collection_for_select(potential_recipients, :id, :email),
multiple: true,
class: 'select2-limited',
placeholder: '')
= f.submit "Envoyer", class: "button large send gap-left"

2
app/views/new_gestionnaire/dossiers/messagerie.html.haml
View file

@ -2,4 +2,4 @@
= render partial: "header", locals: { dossier: @dossier }
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, user_email: current_gestionnaire.email, messagerie_seen_at: @messagerie_seen_at , new_commentaire: @commentaire, form_url: commentaire_gestionnaire_dossier_path(@dossier.procedure, @dossier) }
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, connected_user: current_gestionnaire, messagerie_seen_at: @messagerie_seen_at , new_commentaire: @commentaire, form_url: commentaire_gestionnaire_dossier_path(@dossier.procedure, @dossier) }

2
app/views/new_gestionnaire/dossiers/print.html.haml
View file

@ -84,7 +84,7 @@
%ul.messages-list
- @dossier.commentaires.each do |commentaire|
%li
= render partial: "shared/dossiers/messages/message", locals: { commentaire: commentaire, user_email: current_gestionnaire.email, messagerie_seen_at: nil }
= render partial: "shared/dossiers/messages/message", locals: { commentaire: commentaire, connected_user: current_gestionnaire, messagerie_seen_at: nil }
%script{ type: "text/javascript" }
window.print();

2
app/views/new_gestionnaire/procedures/show.html.haml
View file

@ -81,7 +81,7 @@
%span.button.dropdown
Personnaliser
.dropdown-content.fade-in-down
= form_tag update_displayed_fields_gestionnaire_procedure_path(@procedure), method: :patch, class: 'dropdown-form' do
= form_tag update_displayed_fields_gestionnaire_procedure_path(@procedure), method: :patch, class: 'dropdown-form columns-form' do
= select_tag :values,
options_for_select(@procedure.fields_for_select,
selected: @displayed_fields_values),

21
app/views/new_user/dossiers/_footer.html.haml
View file

@ -1,9 +1,8 @@
%footer.dossier-footer
.container
%ul.footer-columns
- service = dossier.procedure.service
- if service.present?
- service = dossier.procedure.service
- if service.present?
%ul.footer-row.footer-columns
%li.footer-column
%h3.footer-header Cette démarche est gérée par :
%p
@ -29,14 +28,14 @@
%p
Horaires : #{ service.horaires.sub(/\S/, &:downcase) }
- politiques = politiques_conservation_de_donnees(dossier.procedure)
- if politiques.present?
%li.footer-column
%h3.footer-header Conservation des données :
- politiques.each do |politique|
%p= politique
- politiques = politiques_conservation_de_donnees(dossier.procedure)
- if politiques.present?
%li.footer-column
%h3.footer-header Conservation des données :
- politiques.each do |politique|
%p= politique
.footer-bottom-line
.footer-row.footer-bottom-line
= link_to "Accessibilité", accessibilite_index_path, :class => "footer-link"
–
= link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"

2
app/views/new_user/dossiers/messagerie.html.haml
View file

@ -7,4 +7,4 @@
%p.messagerie-explanation
La messagerie vous permet de contacter l’instructeur en charge de votre dossier.
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, user_email: current_user.email, messagerie_seen_at: nil, new_commentaire: @commentaire, form_url: commentaire_dossier_path(@dossier) }
= render partial: "shared/dossiers/messagerie", locals: { dossier: @dossier, connected_user: current_user, messagerie_seen_at: nil, new_commentaire: @commentaire, form_url: commentaire_dossier_path(@dossier) }

4
app/views/shared/dossiers/_messagerie.html.haml
View file

@ -1,7 +1,7 @@
.messagerie.container
%ul.messages-list
- dossier.commentaires.each do |commentaire|
%li.message{ class: commentaire_is_from_me_class(commentaire, user_email) }
= render partial: "shared/dossiers/messages/message", locals: { commentaire: commentaire, user_email: user_email, messagerie_seen_at: messagerie_seen_at }
%li.message{ class: commentaire_is_from_me_class(commentaire, connected_user.email) }
= render partial: "shared/dossiers/messages/message", locals: { commentaire: commentaire, connected_user: connected_user, messagerie_seen_at: messagerie_seen_at }
= render partial: "shared/dossiers/messages/form", locals: { commentaire: new_commentaire, form_url: form_url }

4
app/views/shared/dossiers/messages/_message.html.haml
View file

@ -1,9 +1,9 @@
= render partial: 'shared/dossiers/messages/message_icon', locals: { commentaire: commentaire, user_email: user_email }
= render partial: 'shared/dossiers/messages/message_icon', locals: { commentaire: commentaire, connected_user: connected_user }
.width-100
%h2
%span.mail
= render partial: 'shared/dossiers/messages/message_issuer', locals: { commentaire: commentaire, user_email: user_email }
= render partial: 'shared/dossiers/messages/message_issuer', locals: { commentaire: commentaire, connected_user: connected_user }
- if commentaire_is_from_guest(commentaire)
%span.guest Invité
%span.date{ class: highlight_if_unseen_class(messagerie_seen_at, commentaire.created_at) }

2
app/views/shared/dossiers/messages/_message_icon.html.haml
View file

@ -1,5 +1,5 @@
- case commentaire.email
- when user_email
- when connected_user.email
= image_tag('icons/account-circle.svg', class: 'person-icon')
- when OLD_CONTACT_EMAIL
- when CONTACT_EMAIL

2
app/views/shared/dossiers/messages/_message_issuer.html.haml
View file

@ -1,5 +1,5 @@
- case commentaire.email
- when user_email
- when connected_user.email
Vous
- when OLD_CONTACT_EMAIL
- when CONTACT_EMAIL

2
config/routes.rb
View file

@ -322,7 +322,7 @@ Rails.application.routes.draw do
post 'passer-en-instruction' => 'dossiers#passer_en_instruction'
post 'repasser-en-construction' => 'dossiers#repasser_en_construction'
post 'terminer'
post 'envoyer-a-instructeur' => 'dossiers#envoyer_a_instructeur'
post 'send-to-instructeurs' => 'dossiers#send_to_instructeurs'
scope :carte do
get 'position'
end

6
spec/controllers/new_gestionnaire/dossiers_controller_spec.rb
View file

@ -31,7 +31,7 @@ describe NewGestionnaire::DossiersController, type: :controller do
end
end
describe '#envoyer_a_instructeur' do
describe '#send_to_instructeurs' do
let(:recipient) { create(:gestionnaire) }
let(:gestionnaires) { [gestionnaire, recipient] }
let(:mail) { double("mail") }
@ -45,9 +45,9 @@ describe NewGestionnaire::DossiersController, type: :controller do
.and_return(mail)
post(
:envoyer_a_instructeur,
:send_to_instructeurs,
params: {
recipient: recipient,
recipients: [recipient],
procedure_id: procedure.id,
dossier_id: dossier.id
}

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

@ -134,6 +134,32 @@ feature 'The gestionnaire part' do
expect(page).to have_text(gestionnaire2.email)
end
scenario 'A gestionnaire can send a dossier to several instructeurs', js: true do
instructeur_2 = FactoryBot.create(:gestionnaire)
instructeur_3 = FactoryBot.create(:gestionnaire)
procedure.gestionnaires << [instructeur_2, instructeur_3]
send_dossier = double()
expect(GestionnaireMailer).to receive(:send_dossier).and_return(send_dossier).twice
expect(send_dossier).to receive(:deliver_later).twice
log_in(gestionnaire.email, password)
click_on procedure.libelle
click_on dossier.user.email
click_on 'Personnes impliquées'
first('.select2-container', minimum: 1).click
find('li.select2-results__option[role="treeitem"]', text: instructeur_2.email).click
first('.select2-container', minimum: 1).click
find('li.select2-results__option[role="treeitem"]', text: instructeur_3.email).click
click_on 'Envoyer'
expect(page).to have_text("Dossier envoyé")
end
def log_in(email, password)
visit '/'
click_on 'Connexion'

2
spec/views/shared/dossiers/messages/message.html.haml_spec.rb
View file

@ -1,7 +1,7 @@
describe 'shared/dossiers/messages/message.html.haml', type: :view do
before { view.extend DossierHelper }
subject { render 'shared/dossiers/messages/message.html.haml', commentaire: commentaire, messagerie_seen_at: seen_at, user_email: dossier.user.email }
subject { render 'shared/dossiers/messages/message.html.haml', commentaire: commentaire, messagerie_seen_at: seen_at, connected_user: dossier.user }
let(:dossier) { create(:dossier) }
let(:commentaire) { create(:commentaire, dossier: dossier) }