Bonjour <%= @resource.email %>!
+Bonjour,
Vous avez demandé à regénérer votre mot de passe sur la plateforme TPS. Pour ceci, merci de suivre le lien suivant :
@@ -6,10 +6,6 @@Si vous n'avez pas effectué une telle demande, merci d'ignorer ce mail. Votre mot de passe ne sera pas changé.
-Bonne journée
+Bonne journée,
- -
- ---
-
- L'équipe Téléprocédures Simplifiées
L'équipe Téléprocédures Simplifiées
diff --git a/app/views/dossiers/_avis.html.haml b/app/views/dossiers/_avis.html.haml new file mode 100644 index 000000000..489130448 --- /dev/null +++ b/app/views/dossiers/_avis.html.haml @@ -0,0 +1,56 @@ +- if current_gestionnaire && current_gestionnaire.assigned_on_procedure?(@facade.dossier.procedure_id) + + .default-data-block.default_visible + .row.show-block.infos + .header + .col-xs-12.title + .carret-right + .carret-down + AVIS EXTERNES + .body + .display-block-on-print + - dossier_facade.dossier.avis.by_latest.each do |avis| + - if avis.answer + .panel.panel-success + .panel-heading + %strong= avis.email_to_display + a donné son avis le + = avis.updated_at.localtime.strftime('%d/%m/%Y à %H:%M') + .panel-body + %strong Vous : + = avis.introduction + %hr + %strong= "#{avis.email_to_display} :" + = avis.answer + - else + .panel.panel-info + .panel-heading + Avis demandé à + %strong= avis.email_to_display + le + = avis.created_at.localtime.strftime('%d/%m/%Y à %H:%M') + .panel-body + %strong Vous : + = avis.introduction + %hr + .center + %em Avis en attente + + -# FIXME prevent bug when the user is also a gestionnaire on the procedure #375 + - if @new_avis.present? + .hidden-print + .panel.panel-default + .panel-heading + Demander un avis externe + .panel-body + .help-block + Invitez une personne externe à consulter le dossier et à vous donner un avis sur celui ci. + %br + Cette personne pourra également contribuer au fil de messagerie, mais ne pourra pas modifier le dossier. + + = simple_form_for @new_avis, url: backoffice_dossier_avis_index_path(dossier_facade.dossier.object.id) do |f| + + = f.input 'email', label: "Email de la personne qui doit donner un avis" + = f.input 'introduction', label: "Message" + + = f.submit "Envoyer la demande d'avis", class: 'btn btn-default' diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml index 632a32f20..cfbe4ee02 100644 --- a/app/views/dossiers/_dossier_show.html.haml +++ b/app/views/dossiers/_dossier_show.html.haml @@ -1,3 +1,5 @@ += render partial: 'dossiers/edit_avis', locals: { dossier_facade: @facade } + = render partial: 'dossiers/messagerie', locals: { dossier_facade: @facade } - if @facade.procedure.individual_with_siret @@ -51,8 +53,7 @@ = render partial: '/users/carte/map', locals: { dossier: @facade.dossier } = render partial: 'users/carte/init_carto', locals: { dossier: @facade.dossier } - -- if @current_gestionnaire && gestionnaire_signed_in? && @champs_private.count > 0 +- if @current_gestionnaire && gestionnaire_signed_in? && current_gestionnaire.assigned_on_procedure?(@facade.dossier.procedure_id) && @champs_private.count > 0 .default-data-block.default_visible .row.show-block#private-fields .header @@ -65,3 +66,5 @@ = (private_fields_count == 1) ? "1 champ" : "#{private_fields_count} champs" .body = render partial: '/dossiers/infos_private_fields' + += render partial: 'dossiers/avis', locals: { dossier_facade: @facade } diff --git a/app/views/dossiers/_edit_avis.html.haml b/app/views/dossiers/_edit_avis.html.haml new file mode 100644 index 000000000..491291793 --- /dev/null +++ b/app/views/dossiers/_edit_avis.html.haml @@ -0,0 +1,13 @@ +- if current_gestionnaire + - avis_for_dossier = current_gestionnaire.avis.for_dossier(dossier_facade.dossier.id).by_latest + - if avis_for_dossier.any? + .panel.panel-default + .panel-body + %h4 Votre avis est sollicité sur le dossier : + - avis_for_dossier.each do |avis| + %hr + %p= avis.introduction + = simple_form_for avis, url: backoffice_dossier_avis_path(dossier_facade.dossier, avis) do |f| + = f.input 'answer', label: "Votre avis" + - submit_label = if avis.answer then "Modifier votre avis" else "Enregistrer votre avis" end + = f.submit submit_label, class: 'btn btn-default' diff --git a/app/views/gestionnaire_mailer/last_week_overview.html.haml b/app/views/gestionnaire_mailer/last_week_overview.html.haml new file mode 100644 index 000000000..a82bb9497 --- /dev/null +++ b/app/views/gestionnaire_mailer/last_week_overview.html.haml @@ -0,0 +1,26 @@ +%table{ align: 'center', border: '0', cellpadding: '0', cellspacing: '0', height: '100%', style: 'background-color: #fafafa', width: '100%' } + %tbody + %tr + %td{ align: 'center', style: 'height: 100%; margin: 0; padding: 30px; width: 100%; border-top: 0', valign: 'top' } + %table{ border: '0', cellpadding: '0', cellspacing: '0', style: 'border-collapse: collapse; border: 0; max-width: 600px!important;', width: '100%' } + %tbody + %tr + %td{ style: 'background: #ffffff none no-repeat center/cover; background-color: #ffffff; background-image: none; background-repeat: no-repeat; background-position: center; background-size: cover; border-top: 0; padding-top: 0;', valign: 'top' } + %table{ border: '0', cellpadding: '0', cellspacing: '0', style: 'min-width: 100%; border-collapse: collapse', width: '100%' } + %tr + %td{ style: 'padding: 0 30px; mso-line-height-rule: exactly; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; ', valign: 'top' } + %img{ align: 'middle', alt: 'Logo TPS', src: image_url('mailer/gestionnaire_mailer/logo.png'), style: 'max-width: 125px; padding: 30px 0; display: inline !important; vertical-align: bottom; border: 0; height: auto; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic;' } + %tr + %td{ style: 'padding: 0 30px 30px; word-break: break-word; color: #333333; font-family: Helvetica; font-size: 16px; line-height: 150%; text-align: left; border-bottom: 2px solid #4393F3;', valign: 'top' } + Bonjour, voici votre résumé de l'activité de la semaine du #{l(@args[:start_date], format: '%d %B')} au #{l(DateTime.now, format: '%d %B')}. + %br + %br + + - @args[:procedure_overviews].each do |procedure_overview| + = procedure_overview.to_html.html_safe + %br + %br + Bonne journée, + %br + %br + L'équipe Téléprocédures Simplifiées diff --git a/app/views/gestionnaire_mailer/new_assignement.text.erb b/app/views/gestionnaire_mailer/new_assignement.text.erb index 694f454b8..9af14a3e6 100644 --- a/app/views/gestionnaire_mailer/new_assignement.text.erb +++ b/app/views/gestionnaire_mailer/new_assignement.text.erb @@ -1,4 +1,4 @@ -Bienvenue sur la plateforme TPS +Bienvenue sur la plateforme TPS, Vous venez d'être assigné à un administrateur sur la plateforme TPS. Voici quelques informations utiles : @@ -7,5 +7,4 @@ Vous venez d'être assigné à un administrateur sur la plateforme TPS. Voici qu Bonne journée, ---- L'équipe Téléprocédures Simplifiées diff --git a/app/views/gestionnaire_mailer/new_gestionnaire.text.erb b/app/views/gestionnaire_mailer/new_gestionnaire.text.erb index f7472cb9e..7fdcce89d 100644 --- a/app/views/gestionnaire_mailer/new_gestionnaire.text.erb +++ b/app/views/gestionnaire_mailer/new_gestionnaire.text.erb @@ -1,4 +1,4 @@ -Bienvenue sur la plateforme TPS +Bienvenue sur la plateforme TPS, Vous venez d'être nommé accompagnateur sur la plateforme TPS. Pour mémoire, voici quelques informations utiles : @@ -8,5 +8,4 @@ Vous venez d'être nommé accompagnateur sur la plateforme TPS. Pour mémoire, v Bonne journée, ---- L'équipe Téléprocédures Simplifiées diff --git a/app/views/invite_mailer/invite_guest.text.erb b/app/views/invite_mailer/invite_guest.text.erb index 73894115d..48774e6e0 100644 --- a/app/views/invite_mailer/invite_guest.text.erb +++ b/app/views/invite_mailer/invite_guest.text.erb @@ -1,12 +1,11 @@ -Bonjour <%= @invite.email %> +Bonjour, L'utilisateur <%= @invite.email_sender %> souhaite que vous participiez à l'élaboration d'un dossier sur la plateforme TPS. -Cette plateforme permet à ses utilisateurs d'établir des dossiers 100% en ligne et de dialoguer avec plusieurs interlocuteurs privilégiés avant d'instruire un dépot. +Cette plateforme permet à ses utilisateurs d'établir des dossiers 100 % en ligne et de dialoguer avec plusieurs interlocuteurs privilégiés avant d'instruire un dépot. -Afin de répondre à cette invitation, merci de vous inscrit avec l'adresse email <%= @invite.email %> sur <%= users_dossiers_invite_url(@invite.id)+"?email=#{@invite.email}" %>. +Afin de répondre à cette invitation, merci de vous inscrire avec l'adresse email <%= @invite.email %> sur <%= users_dossiers_invite_url(@invite.id)+"?email=#{@invite.email}" %>. -Bonne journée. +Bonne journée, ---- L'équipe Téléprocédures Simplifiées diff --git a/app/views/invite_mailer/invite_user.text.erb b/app/views/invite_mailer/invite_user.text.erb index 53e98e30c..3c1b9abee 100644 --- a/app/views/invite_mailer/invite_user.text.erb +++ b/app/views/invite_mailer/invite_user.text.erb @@ -1,10 +1,9 @@ -Bonjour <%= @invite.email %> +Bonjour, L'utilisateur <%= @invite.email_sender %> souhaite que vous participiez à l'élaboration d'un dossier sur la plateforme TPS. Pour le consulter, merci de suivre ce lien : <%= users_dossiers_invite_url(@invite.id) %> -Bonne journée. +Bonne journée, ---- L'équipe Téléprocédures Simplifiées diff --git a/app/views/layouts/_google_analytics.html.haml b/app/views/layouts/_google_analytics.html.haml new file mode 100644 index 000000000..5ab328f45 --- /dev/null +++ b/app/views/layouts/_google_analytics.html.haml @@ -0,0 +1,9 @@ +- ua_id = Rails.env.production? ? 'UA-63927236-2' : 'UA-63927236-4' +:javascript + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', '#{ua_id}', 'auto'); + ga('send', 'pageview'); diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 82554fd60..6e656bbc4 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -1,7 +1,6 @@ .new-header{ class: current_page?(root_path) ? nil : 'new-header-with-border' } .header-inner-content - %img.header-logo.pull-left{ src: image_url("header/logo-tps.svg") } + = link_to root_path do + %img.header-logo{ src: image_url("header/logo-tps.svg") } - = link_to "Connexion", new_user_session_path, :class => "header-login-button pull-right" - - .clear-fix + = link_to "Connexion", new_user_session_path, class: "header-login-button" diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml index c1dfe2bd7..d2ea6ea5b 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml @@ -20,6 +20,10 @@ #infos-block .split-hr-left #procedure-list + - if current_gestionnaire.avis.any? + = link_to backoffice_invitations_path do + .procedure-list-element{ class: ('active' if request.path == backoffice_invitations_path) } + Invitations - current_gestionnaire.procedures.by_libelle.each do |procedure| = link_to backoffice_dossiers_procedure_path(procedure.id), { title: procedure.libelle } do .procedure-list-element{ class: ('active' if procedure.id.to_s == params[:id]) } diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml index ccc0aaa36..2560a0bb8 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml @@ -2,8 +2,8 @@ .infos #dossier_id= t('dynamics.dossiers.numéro') + @facade.dossier.id.to_s -#action-block - - if gestionnaire_signed_in? +- if current_gestionnaire && current_gestionnaire.assigned_on_procedure?(@facade.dossier.procedure_id) + #action-block - if !@facade.dossier.read_only? || @facade.dossier.initiated? = link_to 'Passer en instruction', backoffice_dossier_receive_path(@facade.dossier), method: :post, class: 'btn btn-danger btn-block', data: { confirm: "Confirmer vous le passage en instruction de ce dossier ?" } @@ -51,12 +51,12 @@ - if notification.liste.size > 1 .type= "Plusieurs attributs ont été changés, dont: #{notification.liste.join(" ")}" - else - .type= "Un attribut à été changé: #{notification.liste.last}" + .type= "Un attribut a été changé: #{notification.liste.last}" - elsif ['piece_justificative'].include?(notification.type_notif) - if notification.liste.size > 1 .type= "Plusieurs pièces jointes ont été changés, dont: #{notification.liste.join(" ")}" - else - .type= "Une pièce jointe à été changée: #{notification.liste.last}" + .type= "Une pièce jointe a été changée: #{notification.liste.last}" - else .type= notification.liste.last .split-hr diff --git a/app/views/layouts/left_panels/_left_panel_backofficecontroller_invitations.html.haml b/app/views/layouts/left_panels/_left_panel_backofficecontroller_invitations.html.haml new file mode 100644 index 000000000..b4114cab1 --- /dev/null +++ b/app/views/layouts/left_panels/_left_panel_backofficecontroller_invitations.html.haml @@ -0,0 +1 @@ += render partial: 'layouts/left_panels/left_panel_backoffice_dossierscontroller_index' diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml index 9a6fff7a1..9b561f312 100644 --- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml @@ -15,25 +15,25 @@ .procedure-list-element#brouillon{ class: ('active' if @liste == 'brouillon') } Brouillons .badge.progress-bar-default - = @user_dossiers.brouillon.count + = @user_dossiers.state_brouillon.count %a{ :href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.' } .procedure-list-element#a_traiter{ class: ('active' if @liste == 'a_traiter') } En construction .badge.progress-bar-danger - = @user_dossiers.en_construction.count + = @user_dossiers.state_en_construction.count %a{ :href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.' } .procedure-list-element#en_instruction{ class: ('active' if @liste == 'en_instruction') } En instruction .badge.progress-bar-default - = @user_dossiers.en_instruction.count + = @user_dossiers.state_en_instruction.count %a{ :href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".' } .procedure-list-element#termine{ class: ('active' if @liste == 'termine') } Terminé .badge.progress-bar-success - = @user_dossiers.termine.count + = @user_dossiers.state_termine.count %a{ :href => "#{url_for users_dossiers_path(liste: 'invite')}" } .procedure-list-element#invite{ class: ('active' if @liste == 'invite') } diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml index 97027181d..6604a98c1 100644 --- a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml +++ b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml @@ -1,40 +1,43 @@ .col-xs-7.main-info = @facade.dossier.procedure.libelle .col-xs-3.options - .row - .col-xs-12 - - if current_gestionnaire.follow?(@facade.dossier.id) - = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), "data-method" => :put, class: "button-navbar-action", id: "suivre_dossier_#{@facade.dossier.id}" do - %i.fa.fa-user-times - Ne plus suivre - - else - = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), 'data-method' => :put, class: 'button-navbar-action', id: "suivre_dossier_#{@facade.dossier.id}" do - %i.fa.fa-user-plus - Suivre le dossier - .row - .col-xs-12 - #invitations.dropdown-toggle{ 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false } - %i.fa.fa-user - = t('utils.involved') - .badge.progress-bar-info - = @facade.dossier.invites.count - .dropdown-menu.dropdown-menu-right.dropdown-pannel - %h4= t('dynamics.dossiers.followers.title') - %ul - - unless @facade.followers.empty? - - @facade.followers.each do |follower| - %li= follower.email - - else - = t('dynamics.dossiers.followers.empty') - %h4= t('dynamics.dossiers.invites.title') - %ul - - unless @facade.invites.empty? - - @facade.invites.each do |invite| - %li= invite.email - - else - = t('dynamics.dossiers.invites.empty') + - if current_gestionnaire.assigned_on_procedure?(@facade.dossier.procedure_id) + .row + .col-xs-12 + - if current_gestionnaire.follow?(@facade.dossier.id) + = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), "data-method" => :put, class: "button-navbar-action", id: "suivre_dossier_#{@facade.dossier.id}" do + %i.fa.fa-user-times + Ne plus suivre + - else + = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), 'data-method' => :put, class: 'button-navbar-action', id: "suivre_dossier_#{@facade.dossier.id}" do + %i.fa.fa-user-plus + Suivre le dossier + .row + .col-xs-12 + #invitations.dropdown-toggle{ 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false } + %i.fa.fa-user + = t('utils.involved') + .badge.progress-bar-info + = @facade.dossier.invites.count + .dropdown-menu.dropdown-menu-right.dropdown-pannel + %h4= t('dynamics.dossiers.followers.title') + %ul + - unless @facade.followers.empty? + - @facade.followers.each do |follower| + %li= follower.email + - else + = t('dynamics.dossiers.followers.empty') + %h4= t('dynamics.dossiers.invites.title') + %p + %b Attention, les invitations sur les dossiers vont disparaître en faveur des avis externes situés en bas de la page + %ul + - unless @facade.invites.empty? + - @facade.invites.each do |invite| + %li= invite.email + - else + = t('dynamics.dossiers.invites.empty') - %li - = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do - = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email' - = submit_tag 'Ajouter', class: 'btn btn-success', data: { confirm: "Envoyer l'invitation ?" } + %li + = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do + = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email' + = submit_tag 'Ajouter', class: 'btn btn-success', data: { confirm: "Envoyer l'invitation ?" } diff --git a/app/views/layouts/navbars/_navbar_backofficecontroller_invitations.html.haml b/app/views/layouts/navbars/_navbar_backofficecontroller_invitations.html.haml new file mode 100644 index 000000000..eb80c1517 --- /dev/null +++ b/app/views/layouts/navbars/_navbar_backofficecontroller_invitations.html.haml @@ -0,0 +1,2 @@ +.col-xs-10.main-info + INVITATIONS diff --git a/app/views/layouts/new_application.html.haml b/app/views/layouts/new_application.html.haml index ba6539661..19c5bc700 100644 --- a/app/views/layouts/new_application.html.haml +++ b/app/views/layouts/new_application.html.haml @@ -3,6 +3,7 @@ %meta{ "http-equiv" => "Content-Type", :content => "text/html; charset=UTF-8" } %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge" } %meta{ :name => "turbolinks-cache-control", :content => "no-cache" } + %meta{ name: "viewport", content: "width=device-width, initial-scale=1" } = csrf_meta_tags = action_cable_meta_tag @@ -13,7 +14,7 @@ = favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32") = favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96") - = stylesheet_link_tag "new_application", :media => "all", "data-turbolinks-track" => true + = stylesheet_link_tag "new_design/new_application", :media => "all", "data-turbolinks-track" => true = stylesheet_link_tag "print", :media => "print", "data-turbolinks-track" => true %body @@ -36,6 +37,7 @@ = render partial: "layouts/mailjet_newsletter" = javascript_include_tag "application", "data-turbolinks-track" => true + = yield :charts_js - if Rails.env == "test" %script{ :type => "text/javascript" } (typeof jQuery !== "undefined") && (jQuery.fx.off = true); diff --git a/app/views/mails/closed_mail.html.haml b/app/views/mails/closed_mail.html.haml index 5870fc1cf..2acc43fa7 100644 --- a/app/views/mails/closed_mail.html.haml +++ b/app/views/mails/closed_mail.html.haml @@ -1,4 +1,4 @@ -Bonjour +Bonjour, %br %br Votre dossier nº --numero_dossier-- a été accepté le --date_de_decision--. @@ -7,11 +7,13 @@ Votre dossier nº --numero_dossier-- a été accepté le --date_de_decision--. A tout moment, vous pouvez consulter le contenu de vos dossiers et les éventuels commentaires de l'administration à cette adresse : --lien_dossier-- %br %br -Bonne journée +Bonne journée, %br %br -\--- +L'équipe Téléprocédures Simplifiées %br -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. %br -\--- +— +%br +%br +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/mails/initiated_mail.html.haml b/app/views/mails/initiated_mail.html.haml index ce3ae6324..b2e170224 100644 --- a/app/views/mails/initiated_mail.html.haml +++ b/app/views/mails/initiated_mail.html.haml @@ -1,4 +1,4 @@ -Bonjour +Bonjour, %br %br Votre administration vous confirme la bonne réception de votre dossier nº --numero_dossier--. @@ -7,11 +7,13 @@ Votre administration vous confirme la bonne réception de votre dossier nº --n A tout moment, vous pouvez consulter le contenu de vos dossiers et les éventuels commentaires de l'administration à cette adresse : --lien_dossier-- %br %br -Bonne journée +Bonne journée, %br %br -\--- +L'équipe Téléprocédures Simplifiées %br -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. %br -\--- +— +%br +%br +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/mails/received_mail.html.haml b/app/views/mails/received_mail.html.haml index 113139052..acd67a6a6 100644 --- a/app/views/mails/received_mail.html.haml +++ b/app/views/mails/received_mail.html.haml @@ -1,14 +1,16 @@ -Bonjour +Bonjour, %br %br Votre administration vous confirme la bonne réception de votre dossier nº --numero_dossier--. Celui-ci sera instruit dans le délai légal déclaré par votre interlocuteur. %br %br -Bonne journée +Bonne journée, %br %br -\--- +L'équipe Téléprocédures Simplifiées %br -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. %br -\--- +— +%br +%br +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/mails/refused_mail.html.haml b/app/views/mails/refused_mail.html.haml index b2796bf3c..83415496b 100644 --- a/app/views/mails/refused_mail.html.haml +++ b/app/views/mails/refused_mail.html.haml @@ -1,4 +1,4 @@ -Bonjour +Bonjour, %br %br Votre dossier nº --numero_dossier-- a été refusé le --date_de_decision--. @@ -7,11 +7,13 @@ Votre dossier nº --numero_dossier-- a été refusé le --date_de_decision--. Pour en savoir plus sur le motif du refus, vous pouvez consulter le contenu de vos dossiers et les éventuels commentaires de l'administration à cette adresse : --lien_dossier-- %br %br -Bonne journée +Bonne journée, %br %br -\--- +L'équipe Téléprocédures Simplifiées %br -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. %br -\--- +— +%br +%br +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/mails/without_continuation_mail.html.haml b/app/views/mails/without_continuation_mail.html.haml index ddac75477..7882763f2 100644 --- a/app/views/mails/without_continuation_mail.html.haml +++ b/app/views/mails/without_continuation_mail.html.haml @@ -1,4 +1,4 @@ -Bonjour +Bonjour, %br %br Votre dossier nº --numero_dossier-- a été classé sans suite le --date_de_decision--. @@ -7,11 +7,13 @@ Votre dossier nº --numero_dossier-- a été classé sans suite le --date_de_de Pour en savoir plus sur les raisons de ce classement sans suite, vous pouvez consulter le contenu de vos dossiers et les éventuels commentaires de l'administration à cette adresse : --lien_dossier-- %br %br -Bonne journée +Bonne journée, %br %br -\--- +L'équipe Téléprocédures Simplifiées %br -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. %br -\--- +— +%br +%br +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/new_admin_mailer/new_admin_email.text.erb b/app/views/new_admin_mailer/new_admin_email.text.erb index 547713f13..678123a26 100644 --- a/app/views/new_admin_mailer/new_admin_email.text.erb +++ b/app/views/new_admin_mailer/new_admin_email.text.erb @@ -5,5 +5,6 @@ Plateforme : <%= TPS::Application::URL %> Login : <%= @admin.email %> Password : <%= @password %> ---- +Bonne journée, + L'équipe Téléprocédures Simplifiées diff --git a/app/views/notification_mailer/new_answer.text.erb b/app/views/notification_mailer/new_answer.text.erb index 039d306de..240df0b81 100644 --- a/app/views/notification_mailer/new_answer.text.erb +++ b/app/views/notification_mailer/new_answer.text.erb @@ -1,14 +1,13 @@ -Bonjour <%= @user.email %> +Bonjour, Un nouveau message est disponible dans votre espace TPS. Pour le consulter, merci de vous rendre sur <%=users_dossier_recapitulatif_url(dossier_id: @dossier.id)%> -Bonne journée +Bonne journée, ---- -Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme. ---- - ---- L'équipe Téléprocédures Simplifiées + +— + +Merci de ne pas répondre à cet email. Postez directement vos questions dans votre dossier sur la plateforme. diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 561246170..ddff3b458 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -1,23 +1,24 @@ .landing .landing-panel.hero-panel .landing-panel-inner-content - .hero-text.pull-left - %p.hero-tagline - %em.hero-tagline-em Dématérialisez - %br - vos procédures administratives en quelques minutes + .hero-wrapper + .hero-text + %p.hero-tagline + %em.hero-tagline-em Dématérialisez + %br + vos procédures administratives en quelques minutes - = link_to "Demander une démo", - "mailto:#{t("dynamics.contact_email")}?subject=Demande de démo TPS", - :class => "hero-button" + = link_to "Demander une démo", + "mailto:#{t("dynamics.contact_email")}?subject=Demande de démo TPS", + class: "hero-button", + target: "_blank", + onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" - %p.hero-phone-cta - ou nous appeler au 01 40 15 68 49 + %p.hero-phone-cta + ou nous appeler au 01 40 15 68 49 - .hero-illustration.pull-right - %img{ :src => image_url("landing/hero/dematerialiser.svg") } - - .clearfix + .hero-illustration + %img{ :src => image_url("landing/hero/dematerialiser.svg") } .landing-panel.features-panel .landing-panel-inner-content @@ -55,28 +56,26 @@ %ul.quotes %li.quote - %img.quote-quotation-mark.pull-left{ :src => image_url("landing/testimonials/quotation-mark.svg") } - %p.quote-content.pull-right - TPS est un outil de dématérialisation adapté au dépôt de dossiers de demande d’inscription au registre des transporteurs routiers en Ile-de-France. Les échanges avec les usagers sont facilités, ce qui permet de réduire les délais d’instructions et de gagner en efficacité. - .clearfix + %img.quote-quotation-mark{ :src => image_url("landing/testimonials/quotation-mark.svg") } + .quote-content-wrapper + %p.quote-content + TPS est un outil de dématérialisation adapté au dépôt de dossiers de demande d’inscription au registre des transporteurs routiers en Ile-de-France. Les échanges avec les usagers sont facilités, ce qui permet de réduire les délais d’instructions et de gagner en efficacité. - %p.quote-author.pull-left - %span.quote-author-name Elodie Le Rhun - %br - Chef de bureau, DRIEA Ile-de-France - .clearfix + %p.quote-author + %span.quote-author-name Elodie Le Rhun + %br + Chef de bureau, DRIEA Ile-de-France %li.quote - %img.quote-quotation-mark.pull-left{ :src => image_url("landing/testimonials/quotation-mark.svg") } - %p.quote-content.pull-right - TPS c’est surtout l’assurance d’un dialogue en toute fluidité et en toute transparence entre les porteurs de projet et l’administration. Un service qui garantit une économie de temps et beaucoup moins de manipulations des dossiers. - .clearfix + %img.quote-quotation-mark{ :src => image_url("landing/testimonials/quotation-mark.svg") } + .quote-content-wrapper + %p.quote-content + TPS c’est surtout l’assurance d’un dialogue en toute fluidité et en toute transparence entre les porteurs de projet et l’administration. Un service qui garantit une économie de temps et beaucoup moins de manipulations des dossiers. - %p.quote-author.pull-left - %span.quote-author-name Nadja Briki - %br - Déléguée de la Préfète du Pas-de-Calais - .clearfix + %p.quote-author + %span.quote-author-name Nadja Briki + %br + Déléguée de la Préfète du Pas-de-Calais - cache "numbers-panel", :expires_in => 3.hours do .landing-panel.numbers-panel @@ -128,14 +127,15 @@ .landing-panel.cta-panel .landing-panel-inner-content - .pull-right - = link_to "Demander une démo", - "mailto:#{t('dynamics.contact_email')}?subject=Demande de démo TPS", - :class => "cta-panel-button" - %p.cta-panel-phone-cta - ou nous appeler au 01 40 15 68 49 - .pull-left - %h1.cta-panel-title Commencez à dématerialiser vos procédures - %p.cta-panel-explanation Nous vous accompagnons dans la prise en main de l’outil - .clearfix - + .cta-panel-wrapper + %div + %h1.cta-panel-title Commencez à dématerialiser vos procédures + %p.cta-panel-explanation Nous vous accompagnons dans la prise en main de l’outil + %div + = link_to "Demander une démo", + "mailto:#{t('dynamics.contact_email')}?subject=Demande de démo TPS", + class: "cta-panel-button", + target: "_blank", + onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" + %p.cta-panel-phone-cta + ou nous appeler au 01 40 15 68 49 diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml index c3d40561a..4ca7c7914 100644 --- a/app/views/stats/index.html.haml +++ b/app/views/stats/index.html.haml @@ -3,49 +3,87 @@ %h1.new-h1 Statistiques .stat-cards - - .card.stat-card.stat-card-half.pull-left - %ul.segmented-control.pull-right - %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-procedures-chart');" } - Cumul - %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.flux-procedures-chart');" } - Flux (30 jours) - %span.stat-card-title.pull-left Procédures dématérialisées - .clearfix - - .chart-container - .chart.cumulative-procedures-chart - = area_chart @procedures_cumulative, - :colors => ["rgba(61, 149, 236, 1)"] - .chart.flux-procedures-chart.hidden - = line_chart @procedures_30_days_flow, - :colors => ["rgba(61, 149, 236, 1)"] - - .card.stat-card.stat-card-half.pull-left - %ul.segmented-control.pull-right - %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-dossiers-chart');" } - Cumul - %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.flux-dossiers-chart');" } - Flux (30 jours) - %span.stat-card-title.pull-left Dossiers déposés - .clearfix - - .chart-container - .chart.cumulative-dossiers-chart - = area_chart @dossiers_cumulative, - :colors => ["rgba(61, 149, 236, 1)"] - .chart.flux-dossiers-chart.hidden - = line_chart @dossiers_30_days_flow, - :colors => ["rgba(61, 149, 236, 1)"] - - .card.stat-card.stat-card-half.big-number-card.pull-left + .stat-card.stat-card-half.big-number-card.pull-left %span.big-number-card-title TOTAL PROCÉDURES DÉMATÉRIALISÉES %span.big-number-card-number = number_with_delimiter(@procedures_count) - .card.stat-card.stat-card-half.big-number-card.pull-left + .stat-card.stat-card-half.big-number-card.pull-left %span.big-number-card-title TOTAL DOSSIERS DÉPOSÉS %span.big-number-card-number = number_with_delimiter(@dossiers_count) + .stat-card.stat-card-half.pull-left + %ul.segmented-control.pull-right + %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.monthly-procedures-chart');" } + Par mois + %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.cumulative-procedures-chart');" } + Cumul + %span.stat-card-title.pull-left Procédures dématérialisées + .clearfix + + .chart-container + .chart.monthly-procedures-chart + = column_chart @procedures_in_the_last_4_months + .chart.cumulative-procedures-chart.hidden + = area_chart @procedures_cumulative + + .stat-card.stat-card-half.pull-left + %ul.segmented-control.pull-right + %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.monthly-dossiers-chart');" } + Par mois + %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.cumulative-dossiers-chart');" } + Cumul + %span.stat-card-title.pull-left Dossiers déposés + .clearfix + + .chart-container + .chart.monthly-dossiers-chart + = column_chart @dossiers_in_the_last_4_months + .chart.cumulative-dossiers-chart.hidden + = area_chart @dossiers_cumulative + + .stat-card.stat-card-half.pull-left + %span.stat-card-title + Nombre d'administrations ayant dématérialisé N procédures + + .chart-container + .chart + = pie_chart @procedures_count_per_administrateur + + - if administration_signed_in? + .stat-card.stat-card-half.pull-left + %span.stat-card-title Temps de traitement moyen d'un dossier + + .chart-container + .chart + = line_chart @dossier_instruction_mean_time, + :ytitle => "Jours" + + .stat-card.stat-card-half.pull-left + %span.stat-card-title Temps de remplissage moyen d'un dossier + + .chart-container + .chart + = line_chart @dossier_filling_mean_time, + :ytitle => "Minutes" + .clearfix + + - if administration_signed_in? + %h2.new-h2 Avis + + .stat-cards + .stat-card.stat-card-half.pull-left + %span.stat-card-title Taux d'utilisation des avis + = line_chart @avis_usage, ytitle: 'dossiers avec avis / total dossiers', xtitle: 'semaines' + + .stat-card.stat-card-half.pull-left + %span.stat-card-title Temps de réponse moyen par avis + = line_chart @avis_average_answer_time, ytitle: 'jours', xtitle: 'semaines' + + .stat-card.stat-card-half.pull-left + %span.stat-card-title Pourcentage d'avis rempli + = line_chart @avis_answer_percentages, ytitle: 'avis avec réponse / total avis', xtitle: 'semaines' + + .clearfix diff --git a/app/views/users/description/champs/_date.html.haml b/app/views/users/description/champs/_date.html.haml new file mode 100644 index 000000000..f04b581a6 --- /dev/null +++ b/app/views/users/description/champs/_date.html.haml @@ -0,0 +1,5 @@ +%input.form-control{ name: "champs['#{champ.id}']", + placeholder: "JJ/MM/AAAA", + id: "champs_#{champ.id}", + value: champ.value, + type: "date" } diff --git a/app/views/users/description/champs/_render_list_champs.html.haml b/app/views/users/description/champs/_render_list_champs.html.haml index 01c395d33..6bb776379 100644 --- a/app/views/users/description/champs/_render_list_champs.html.haml +++ b/app/views/users/description/champs/_render_list_champs.html.haml @@ -47,14 +47,16 @@ - when 'explication' + - when 'date' + = render partial: 'users/description/champs/date', locals: { champ: champ } + - else %input.form-control{ name: "champs['#{champ.id}']", placeholder: champ.libelle, id: "champs_#{champ.id}", value: champ.value, - type: champ.type_champ, - 'data-provide' => champ.data_provide, - 'data-date-format' => champ.data_date_format } + type: champ.type_champ } + - unless champ.description.empty? %div{ id: "description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') } diff --git a/app/views/welcome_mailer/welcome_email.text.erb b/app/views/welcome_mailer/welcome_email.text.erb index 90b547ce5..5fb3d1d8a 100644 --- a/app/views/welcome_mailer/welcome_email.text.erb +++ b/app/views/welcome_mailer/welcome_email.text.erb @@ -1,8 +1,8 @@ -Bienvenue sur la plateforme TPS +Bienvenue sur la plateforme TPS, Nous vous remercions de vous être inscrit sur TPS. Pour mémoire, voici quelques informations utiles : - URL : <%= root_url %>> + URL : <%= root_url %> Login : <%= @user.email %> Oubli de mot de passe, pas de problème : @@ -11,5 +11,4 @@ Oubli de mot de passe, pas de problème : Bonne journée, ---- L'équipe Téléprocédures Simplifiées diff --git a/app/workers/auto_archive_procedure_worker.rb b/app/workers/auto_archive_procedure_worker.rb index 61701b4ff..54875a961 100644 --- a/app/workers/auto_archive_procedure_worker.rb +++ b/app/workers/auto_archive_procedure_worker.rb @@ -2,13 +2,12 @@ class AutoArchiveProcedureWorker include Sidekiq::Worker def perform(*args) - procedures_to_archive = Procedure.not_archived.where("auto_archive_on <= ?", Date.today) + Procedure.not_archived.where("auto_archive_on <= ?", Date.today).each do |procedure| + procedure.dossiers.state_en_construction.each do |dossier| + dossier.received! + end - procedures_to_archive.each do |p| - p.dossiers.en_construction.update_all(state: :received) + procedure.update_attributes!(archived: true) end - - procedures_to_archive.update_all(archived: true, auto_archive_on: nil) - end end diff --git a/app/workers/weekly_overview_worker.rb b/app/workers/weekly_overview_worker.rb new file mode 100644 index 000000000..8f15194a7 --- /dev/null +++ b/app/workers/weekly_overview_worker.rb @@ -0,0 +1,13 @@ +class WeeklyOverviewWorker + include Sidekiq::Worker + + def perform(*args) + # Feature flipped to avoid mails in staging due to unprocessed dossier + if Features.weekly_overview + Gestionnaire.all + .map { |gestionnaire| [gestionnaire, gestionnaire.last_week_overview] } + .reject { |_, overview| overview.nil? } + .each { |gestionnaire, overview| GestionnaireMailer.last_week_overview(gestionnaire, overview).deliver_now } + end + end +end diff --git a/config/deploy.rb b/config/deploy.rb index eae817ea8..1895843ba 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -15,7 +15,6 @@ raise "Bad to=#{+ENV['to']}" unless ["staging", "production"].include?(ENV['to'] raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil? -print "Deploy to #{ENV['to']} environment branch #{branch}\n" # set :domain, '5.135.190.60' set :domain, ENV['domain'] @@ -26,25 +25,19 @@ set :deploy_to, '/var/www/tps_dev' case ENV["to"] when "staging" - if ENV['branch'].nil? - set :branch, 'staging' - else - set :branch, ENV['branch'] - end + set :branch, ENV['branch'] || 'develop' set :deploy_to, '/var/www/tps_dev' set :user, 'tps_dev' # Username in the server to SSH to. appname = 'tps_dev' when "production" - if ENV['branch'].nil? - set :branch, 'master' - else - set :branch, ENV['branch'] - end + set :branch, ENV['branch'] || 'master' set :deploy_to, '/var/www/tps' set :user, 'tps' # Username in the server to SSH to. appname = 'tps' end +print "Deploy to #{ENV['to']} environment branch #{branch}\n" + set :rails_env, ENV["to"] # For system-wide RVM install. @@ -76,7 +69,6 @@ set :shared_paths, [ 'config/france_connect.yml', 'config/initializers/mailjet.rb', 'config/initializers/storage_url.rb', - 'app/views/layouts/_google_analytics.html', 'app/views/cgu/index.html.haml' ] diff --git a/config/environments/development.rb b/config/environments/development.rb index acb324db7..a03dda8e0 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -42,6 +42,7 @@ Rails.application.configure do # Action Mailer settings config.action_mailer.delivery_method = :smtp config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } + config.action_mailer.asset_host = 'http://localhost:3000' # Config for mailcatcher https://mailcatcher.me/ config.action_mailer.smtp_settings = { :address => "localhost", diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 882590de7..c20bc1259 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -Rails.application.config.assets.precompile += %w(print.css new_application.css) +Rails.application.config.assets.precompile += %w(print.css new_design/new_application.css) diff --git a/config/initializers/chartkick.rb b/config/initializers/chartkick.rb new file mode 100644 index 000000000..3fa55389c --- /dev/null +++ b/config/initializers/chartkick.rb @@ -0,0 +1,4 @@ +Chartkick.options = { + content_for: :charts_js, + colors: ["rgba(191, 220, 249, 1)", "rgba(113, 176, 239, 1)", "rgba(61, 149, 236, 1)"] +} diff --git a/config/initializers/features.yml b/config/initializers/features.yml index e91fb5346..7776e7e30 100644 --- a/config/initializers/features.yml +++ b/config/initializers/features.yml @@ -1 +1,2 @@ remote_storage: false +weekly_overview: false diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index a3bd49fb8..864ba4221 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -15,6 +15,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.irregular 'type_de_champ', 'types_de_champ' inflect.irregular 'type_de_champ_private', 'types_de_champ_private' inflect.irregular 'assign_to', 'assign_tos' + inflect.irregular('avis', 'avis') end # These inflection rules are supported but not enabled by default: @@ -24,4 +25,5 @@ end ActiveSupport::Inflector.inflections(:fr) do |inflect| inflect.plural(/$/, 's') inflect.plural(/(hib|ch|bij|caill|p|gen|jouj)ou$/i, '\1oux') + inflect.irregular('avis', 'avis') end diff --git a/config/routes.rb b/config/routes.rb index 16b0b090a..8e2c90217 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,6 +30,9 @@ Rails.application.routes.draw do put '/gestionnaires' => 'gestionnaires/registrations#update', :as => 'gestionnaires_registration' end + get 'avis/:id/sign_up/email/:email' => 'backoffice/avis#sign_up', constraints: { email: /.*/ }, as: 'avis_sign_up' + post 'avis/:id/sign_up/email/:email' => 'backoffice/avis#create_gestionnaire', constraints: { email: /.*/ } + devise_scope :administrateur do get '/administrateurs/sign_in/demo' => 'administrateurs/sessions#demo' end @@ -167,6 +170,8 @@ Rails.application.routes.draw do resource :private_formulaire + get 'invitations' + resources :dossiers do post 'receive' => 'dossiers#receive' post 'refuse' => 'dossiers#refuse' @@ -179,6 +184,7 @@ Rails.application.routes.draw do post 'reopen' => 'dossiers#reopen' put 'follow' => 'dossiers#follow' resources :commentaires, only: [:index] + resources :avis, only: [:create, :update] end namespace :dossiers do diff --git a/config/schedule.yml b/config/schedule.yml index 79dbdefc9..9a2979d42 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -1,3 +1,6 @@ auto_archive_procedure: cron: "* * * * *" class: "AutoArchiveProcedureWorker" +weekly_overview_worker: + cron: "0 8 * * 0" + class: "WeeklyOverviewWorker" diff --git a/db/migrate/20170425100757_create_avis.rb b/db/migrate/20170425100757_create_avis.rb new file mode 100644 index 000000000..229be2178 --- /dev/null +++ b/db/migrate/20170425100757_create_avis.rb @@ -0,0 +1,13 @@ +class CreateAvis < ActiveRecord::Migration[5.0] + def change + create_table :avis do |t| + t.string :email + t.text :introduction + t.text :answer + t.references :gestionnaire + t.references :dossier + + t.timestamps + end + end +end diff --git a/db/migrate/20170523092900_add_claimant_to_avis.rb b/db/migrate/20170523092900_add_claimant_to_avis.rb new file mode 100644 index 000000000..c8a34e182 --- /dev/null +++ b/db/migrate/20170523092900_add_claimant_to_avis.rb @@ -0,0 +1,5 @@ +class AddClaimantToAvis < ActiveRecord::Migration[5.0] + def change + add_reference :avis, :claimant, foreign_key: { to_table: :gestionnaires }, null: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 140dccaf6..81476287a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170414095411) do +ActiveRecord::Schema.define(version: 20170523092900) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -71,6 +71,20 @@ ActiveRecord::Schema.define(version: 20170414095411) do t.index ["procedure_id"], name: "index_assign_tos_on_procedure_id", using: :btree end + create_table "avis", force: :cascade do |t| + t.string "email" + t.text "introduction" + t.text "answer" + t.integer "gestionnaire_id" + t.integer "dossier_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "claimant_id", null: false + t.index ["claimant_id"], name: "index_avis_on_claimant_id", using: :btree + t.index ["dossier_id"], name: "index_avis_on_dossier_id", using: :btree + t.index ["gestionnaire_id"], name: "index_avis_on_gestionnaire_id", using: :btree + end + create_table "cadastres", force: :cascade do |t| t.string "surface_intersection" t.float "surface_parcelle" @@ -434,6 +448,7 @@ ActiveRecord::Schema.define(version: 20170414095411) do t.index ["procedure_id"], name: "index_without_continuation_mails_on_procedure_id", using: :btree end + add_foreign_key "avis", "gestionnaires", column: "claimant_id" add_foreign_key "cerfas", "dossiers" add_foreign_key "closed_mails", "procedures" add_foreign_key "commentaires", "dossiers" diff --git a/spec/controllers/admin/mail_templates_controller_spec.rb b/spec/controllers/admin/mail_templates_controller_spec.rb index 31adfd4ee..09db84650 100644 --- a/spec/controllers/admin/mail_templates_controller_spec.rb +++ b/spec/controllers/admin/mail_templates_controller_spec.rb @@ -25,7 +25,7 @@ describe Admin::MailTemplatesController, type: :controller do before :each do patch :update, params: { procedure_id: procedure.id, - id: initiated_mail.class.slug, + id: initiated_mail.class.const_get(:SLUG), mail_template: { object: object, body: body } } end @@ -33,7 +33,7 @@ describe Admin::MailTemplatesController, type: :controller do it { expect(response).to redirect_to admin_procedure_mail_templates_path(procedure) } context 'the mail template' do - subject { procedure.reload ; procedure.initiated_mail } + subject { procedure.reload ; procedure.initiated_mail_template } it { expect(subject.object).to eq(object) } it { expect(subject.body).to eq(body) } diff --git a/spec/controllers/backoffice/avis_controller_spec.rb b/spec/controllers/backoffice/avis_controller_spec.rb new file mode 100644 index 000000000..c1af9658b --- /dev/null +++ b/spec/controllers/backoffice/avis_controller_spec.rb @@ -0,0 +1,186 @@ +require 'spec_helper' + +describe Backoffice::AvisController, type: :controller do + + describe '#POST create' do + let(:gestionnaire){ create(:gestionnaire) } + let!(:dossier){ create(:dossier, state: 'received') } + let!(:assign_to){ create(:assign_to, gestionnaire: gestionnaire, procedure: dossier.procedure )} + + subject { post :create, params: { dossier_id: dossier.id, avis: { email: gestionnaire.email, introduction: "Bonjour, regardez ce joli dossier." } } } + + context 'when gestionnaire is not authenticated' do + it { is_expected.to redirect_to new_user_session_path } + it { expect{ subject }.to_not change(Avis, :count) } + end + + context 'when gestionnaire is authenticated' do + before do + sign_in gestionnaire + end + + context 'When gestionnaire is known' do + it { is_expected.to redirect_to backoffice_dossier_path(dossier.id) } + it { expect{ subject }.to change(Avis, :count).by(1) } + it do + subject + expect(gestionnaire.avis.last).to_not eq(nil) + expect(gestionnaire.avis.last.email).to eq(nil) + expect(gestionnaire.avis.last.dossier_id).to eq(dossier.id) + end + end + end + end + + describe '#POST update' do + let(:gestionnaire){ create(:gestionnaire) } + let(:dossier){ create(:dossier, state: 'received') } + let(:avis){ create(:avis, dossier: dossier, gestionnaire: gestionnaire )} + + subject { post :update, params: { dossier_id: dossier.id, id: avis.id, avis: { answer: "Ok ce dossier est valide." } } } + + before :each do + notification = double('notification', notify: true) + allow(NotificationService).to receive(:new).and_return(notification) + end + + context 'when gestionnaire is not authenticated' do + it { is_expected.to redirect_to new_user_session_path } + it { expect(avis.answer).to be_nil } + end + + context 'when gestionnaire is authenticated' do + before do + sign_in gestionnaire + end + + context 'and is invited on dossier' do + it { is_expected.to redirect_to backoffice_dossier_path(dossier.id) } + it do + subject + expect(avis.reload.answer).to eq("Ok ce dossier est valide.") + expect(NotificationService).to have_received(:new).at_least(:once) + end + end + + context 'but is not invited on dossier' do + let(:gestionnaire2) { create(:gestionnaire) } + let(:avis){ create(:avis, dossier: dossier, gestionnaire: gestionnaire2 )} + + it { expect{ subject }.to raise_error(ActiveRecord::RecordNotFound) } + end + end + end + + describe '.sign_up' do + let(:invited_email) { 'invited@avis.com' } + let(:dossier) { create(:dossier) } + let!(:avis) { create(:avis, email: invited_email, dossier: dossier) } + let(:invitations_email) { true } + + context 'when the new gestionnaire has never signed up' do + before do + expect(Avis).to receive(:avis_exists_and_email_belongs_to_avis?) + .with(avis.id.to_s, invited_email) + .and_return(invitations_email) + get :sign_up, params: { id: avis.id, email: invited_email } + end + + context 'when the email belongs to the invitation' do + it { expect(subject.status).to eq(200) } + it { expect(assigns(:email)).to eq(invited_email) } + it { expect(assigns(:dossier)).to eq(dossier) } + end + + context 'when the email does not belong to the invitation' do + let(:invitations_email) { false } + + it { is_expected.to redirect_to root_path } + end + end + + context 'when the gestionnaire has already signed up and belongs to the invitation' do + let(:gestionnaire) { create(:gestionnaire, email: invited_email) } + let!(:avis) { create(:avis, dossier: dossier, gestionnaire: gestionnaire) } + + context 'when the gestionnaire is authenticated' do + before do + sign_in gestionnaire + get :sign_up, params: { id: avis.id, email: invited_email } + end + + it { is_expected.to redirect_to backoffice_dossier_url(avis.dossier) } + end + + context 'when the gestionnaire is not authenticated' do + before do + get :sign_up, params: { id: avis.id, email: invited_email } + end + + it { is_expected.to redirect_to new_gestionnaire_session_url } + end + end + + context 'when the gestionnaire has already signed up / is authenticated and does not belong to the invitation' do + let(:gestionnaire) { create(:gestionnaire, email: 'other@gmail.com') } + let!(:avis) { create(:avis, email: invited_email, dossier: dossier) } + + before do + sign_in gestionnaire + get :sign_up, params: { id: avis.id, email: invited_email } + end + + # redirected to dossier but then the gestionnaire gonna be banished ! + it { is_expected.to redirect_to backoffice_dossier_url(avis.dossier) } + end + end + + describe '.create_gestionnaire' do + let(:invited_email) { 'invited@avis.com' } + let(:dossier) { create(:dossier) } + let!(:avis) { create(:avis, email: invited_email, dossier: dossier) } + let(:avis_id) { avis.id } + let(:password) { '12345678' } + let(:created_gestionnaire) { Gestionnaire.find_by(email: invited_email) } + let(:invitations_email) { true } + + before do + allow(Avis).to receive(:link_avis_to_gestionnaire) + expect(Avis).to receive(:avis_exists_and_email_belongs_to_avis?) + .with(avis_id.to_s, invited_email) + .and_return(invitations_email) + + post :create_gestionnaire, params: { id: avis_id, + email: invited_email, + gestionnaire: { + password: password + } } + end + + context 'when the email does not belong to the invitation' do + let(:invitations_email) { false } + + it { is_expected.to redirect_to root_path } + end + + context 'when the email belongs to the invitation' do + context 'when the gestionnaire creation succeeds' do + it { expect(created_gestionnaire).to be_present } + it { expect(created_gestionnaire.valid_password?(password)).to be true } + + it { expect(Avis).to have_received(:link_avis_to_gestionnaire) } + + it { expect(subject.current_gestionnaire).to eq(created_gestionnaire) } + it { is_expected.to redirect_to backoffice_dossier_path(dossier) } + end + + context 'when the gestionnaire creation fails' do + let(:password) { '' } + + it { expect(created_gestionnaire).to be_nil } + it { is_expected.to redirect_to avis_sign_up_path(avis_id, invited_email) } + it { expect(flash.alert).to eq('Password : Le mot de passe est vide') } + end + end + end +end diff --git a/spec/controllers/backoffice/dossiers_controller_spec.rb b/spec/controllers/backoffice/dossiers_controller_spec.rb index 7ba92db57..a5889ec9f 100644 --- a/spec/controllers/backoffice/dossiers_controller_spec.rb +++ b/spec/controllers/backoffice/dossiers_controller_spec.rb @@ -97,7 +97,7 @@ describe Backoffice::DossiersController, type: :controller do describe 'all notifications unread are changed' do it do - expect(Notification).to receive(:where).with(dossier_id: dossier_id).and_return(Notification::ActiveRecord_Relation) + expect(Notification).to receive(:where).with(dossier_id: dossier_id.to_s).and_return(Notification::ActiveRecord_Relation) expect(Notification::ActiveRecord_Relation).to receive(:update_all).with(already_read: true).and_return(true) subject @@ -109,6 +109,32 @@ describe Backoffice::DossiersController, type: :controller do it { expect(subject).to redirect_to('/backoffice') } end + + describe 'he can invite somebody for avis' do + render_views + + it { expect(subject.body).to include("Invitez une personne externe à consulter le dossier et à vous donner un avis sur celui ci.") } + end + + context 'and is invited on a dossier' do + let(:dossier_invited){ create(:dossier, procedure: create(:procedure)) } + let!(:avis){ create(:avis, dossier: dossier_invited, gestionnaire: gestionnaire) } + + subject { get :show, params: { id: dossier_invited.id } } + + render_views + + it { expect(subject.status).to eq(200) } + it { expect(subject.body).to include("Votre avis est sollicité sur le dossier") } + it { expect(subject.body).to_not include("Invitez une personne externe à consulter le dossier et à vous donner un avis sur celui ci.") } + + describe 'the notifications are not marked as read' do + it do + expect(Notification).not_to receive(:where) + subject + end + end + end end context 'gestionnaire does not connected but dossier id is correct' do diff --git a/spec/controllers/backoffice_controller_spec.rb b/spec/controllers/backoffice_controller_spec.rb index 00db207ae..540f8db82 100644 --- a/spec/controllers/backoffice_controller_spec.rb +++ b/spec/controllers/backoffice_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe BackofficeController, type: :controller do describe 'GET #index' do - context 'when gestionnaire is not connected'do + context 'when gestionnaire is not connected' do before do get :index end @@ -10,7 +10,7 @@ describe BackofficeController, type: :controller do it { expect(response).to redirect_to :new_gestionnaire_session } end - context 'when gestionnaire is connected'do + context 'when gestionnaire is connected' do before do sign_in create(:gestionnaire) get :index @@ -19,4 +19,45 @@ describe BackofficeController, type: :controller do it { expect(response).to redirect_to :backoffice_dossiers } end end + + describe 'GET #invitations' do + context 'when gestionnaire is not invited on any dossiers' do + render_views + + before do + sign_in create(:gestionnaire) + get :invitations + end + + it { expect(response.status).to eq(200) } + it { expect(response.body).to include("INVITATIONS") } + it { expect(response.body).to include("0 avis à rendre") } + it { expect(response.body).to include("0 avis rendus") } + end + + context 'when gestionnaire is invited on a dossier' do + let(:dossier){ create(:dossier) } + let(:gestionnaire){ create(:gestionnaire) } + let!(:avis){ create(:avis, dossier: dossier, gestionnaire: gestionnaire) } + render_views + + before do + sign_in gestionnaire + get :invitations + end + + it { expect(response.status).to eq(200) } + it { expect(response.body).to include("1 avis à rendre") } + it { expect(response.body).to include("0 avis rendus") } + it { expect(response.body).to include(dossier.procedure.libelle) } + + context 'when avis is already sent' do + let!(:avis){ create(:avis, dossier: dossier, gestionnaire: gestionnaire, answer: "Voici mon avis.") } + + it { expect(response.body).to include("0 avis à rendre") } + it { expect(response.body).to include("1 avis rendu") } + it { expect(response.body).to include(dossier.procedure.libelle) } + end + end + end end diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb index 474f03dfd..9b0b7ed56 100644 --- a/spec/controllers/root_controller_spec.rb +++ b/spec/controllers/root_controller_spec.rb @@ -45,6 +45,14 @@ describe RootController, type: :controller do it { expect(subject).to redirect_to(admin_procedures_path) } end + context 'when Administration is connected' do + before do + sign_in create(:administration) + end + + it { expect(subject).to redirect_to(administrations_path) } + end + context 'when nobody is connected' do render_views diff --git a/spec/controllers/stats_controller_spec.rb b/spec/controllers/stats_controller_spec.rb index 6cbaf91bd..d574fde07 100644 --- a/spec/controllers/stats_controller_spec.rb +++ b/spec/controllers/stats_controller_spec.rb @@ -1,51 +1,41 @@ require 'spec_helper' describe StatsController, type: :controller do - describe '#thirty_days_flow_hash' do - context "without a date_attribut" do + describe "#last_four_months_hash" do + context "without a date attribute" do before do + FactoryGirl.create(:procedure, :created_at => 6.months.ago) FactoryGirl.create(:procedure, :created_at => 45.days.ago) - FactoryGirl.create(:procedure, :created_at => 15.days.ago) - FactoryGirl.create(:procedure, :created_at => 1.day.ago) - - @expected_hash = {} - (30.days.ago.to_date..Time.now.to_date).each do |day| - if [15.days.ago.to_date, 1.day.ago.to_date].include?(day) - @expected_hash[day] = 1 - else - @expected_hash[day] = 0 - end - end + FactoryGirl.create(:procedure, :created_at => 1.days.ago) + FactoryGirl.create(:procedure, :created_at => 1.days.ago) end let (:association) { Procedure.all } - subject { StatsController.new.send(:thirty_days_flow_hash, association) } + subject { StatsController.new.send(:last_four_months_hash, association) } - it { expect(subject).to eq(@expected_hash) } + it { expect(subject).to eq([ + [I18n.l(45.days.ago.beginning_of_month, format: "%B %Y"), 1], + [I18n.l(1.days.ago.beginning_of_month, format: "%B %Y"), 2] + ] ) } end - context "with a date_attribut" do + context "with a date attribute" do before do - FactoryGirl.create(:procedure, :created_at => 45.days.ago, :updated_at => 50.days.ago) - FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 10.days.ago) - FactoryGirl.create(:procedure, :created_at => 1.day.ago, :updated_at => 3.days.ago) - - @expected_hash = {} - (30.days.ago.to_date..Time.now.to_date).each do |day| - if [10.days.ago.to_date, 3.day.ago.to_date].include?(day) - @expected_hash[day] = 1 - else - @expected_hash[day] = 0 - end - end + FactoryGirl.create(:procedure, :created_at => 6.months.ago, :updated_at => 6.months.ago) + FactoryGirl.create(:procedure, :created_at => 2.months.ago, :updated_at => 45.days.ago) + FactoryGirl.create(:procedure, :created_at => 2.months.ago, :updated_at => 45.days.ago) + FactoryGirl.create(:procedure, :created_at => 2.months.ago, :updated_at => 1.days.ago) end let (:association) { Procedure.all } - subject { StatsController.new.send(:thirty_days_flow_hash, association, :updated_at) } + subject { StatsController.new.send(:last_four_months_hash, association, :updated_at) } - it { expect(subject).to eq(@expected_hash) } + it { expect(subject).to eq([ + [I18n.l(45.days.ago.beginning_of_month, format: "%B %Y"), 2], + [I18n.l(1.days.ago.beginning_of_month, format: "%B %Y"), 1] + ] ) } end end @@ -66,22 +56,211 @@ describe StatsController, type: :controller do 15.days.ago.beginning_of_month => 3 }) } end + + context "with a date attribute" do + before do + FactoryGirl.create(:procedure, :created_at => 45.days.ago, :updated_at => 20.days.ago) + FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 20.days.ago) + FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 10.days.ago) + end + + let (:association) { Procedure.all } + + subject { StatsController.new.send(:cumulative_hash, association, :updated_at) } + + it { expect(subject).to eq({ + 20.days.ago.beginning_of_month => 2, + 10.days.ago.beginning_of_month => 3 + }) } + end end - context "with a date attribute" do + describe "#procedures_count_per_administrateur" do + let!(:administrateur_1) { create(:administrateur) } + let!(:administrateur_2) { create(:administrateur) } + let!(:administrateur_3) { create(:administrateur) } + let!(:administrateur_4) { create(:administrateur) } + let!(:administrateur_5) { create(:administrateur) } + before do - FactoryGirl.create(:procedure, :created_at => 45.days.ago, :updated_at => 20.days.ago) - FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 20.days.ago) - FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 10.days.ago) + 3.times do + create(:procedure, published: true, administrateur: administrateur_1) + end + + 2.times do + create(:procedure, published: true, administrateur: administrateur_2) + end + + 8.times do + create(:procedure, published: true, administrateur: administrateur_3) + end + + create(:procedure, published: true, administrateur: administrateur_4) end - let (:association) { Procedure.all } + let(:association){ Procedure.all } - subject { StatsController.new.send(:cumulative_hash, association, :updated_at) } + subject { StatsController.new.send(:procedures_count_per_administrateur, association) } - it { expect(subject).to eq({ - 20.days.ago.beginning_of_month => 2, - 10.days.ago.beginning_of_month => 3 - }) } + it do + is_expected.to eq({ + 'Une procédure' => 1, + 'Entre deux et cinq procédures' => 2, + 'Plus de cinq procédures' => 1 + }) + end + end + + describe "#dossier_instruction_mean_time" do + # Month-2: mean 3 days + # procedure_1: mean 2 days + # dossier_p1_a: 3 days + # dossier_p1_b: 1 days + # procedure_2: mean 4 days + # dossier_p2_a: 4 days + # + # Month-1: mean 5 days + # procedure_1: mean 5 days + # dossier_p1_c: 5 days + + before do + procedure_1 = FactoryGirl.create(:procedure) + procedure_2 = FactoryGirl.create(:procedure) + dossier_p1_a = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :initiated_at => 2.months.ago.beginning_of_month, + :processed_at => 2.months.ago.beginning_of_month + 3.days) + dossier_p1_b = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :initiated_at => 2.months.ago.beginning_of_month, + :processed_at => 2.months.ago.beginning_of_month + 1.days) + dossier_p1_c = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :initiated_at => 1.months.ago.beginning_of_month, + :processed_at => 1.months.ago.beginning_of_month + 5.days) + dossier_p2_a = FactoryGirl.create(:dossier, + :procedure => procedure_2, + :initiated_at => 2.month.ago.beginning_of_month, + :processed_at => 2.month.ago.beginning_of_month + 4.days) + + # Write directly in the DB to avoid the before_validation hook + Dossier.update_all(state: "closed") + + @expected_hash = { + "#{2.months.ago.beginning_of_month}" => 3.0, + "#{1.months.ago.beginning_of_month}" => 5.0 + } + end + + let (:association) { Dossier.where.not(:state => :draft) } + + subject { StatsController.new.send(:dossier_instruction_mean_time, association) } + + it { expect(subject).to eq(@expected_hash) } + end + + describe "#dossier_filling_mean_time" do + # Month-2: mean 30 minutes + # procedure_1: mean 20 minutes + # dossier_p1_a: 30 minutes + # dossier_p1_b: 10 minutes + # procedure_2: mean 40 minutes + # dossier_p2_a: 80 minutes, for twice the fields + # + # Month-1: mean 50 minutes + # procedure_1: mean 50 minutes + # dossier_p1_c: 50 minutes + + before do + procedure_1 = FactoryGirl.create(:procedure, :with_type_de_champ, :types_de_champ_count => 24) + procedure_2 = FactoryGirl.create(:procedure, :with_type_de_champ, :types_de_champ_count => 48) + dossier_p1_a = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :created_at => 2.months.ago.beginning_of_month, + :initiated_at => 2.months.ago.beginning_of_month + 30.minutes, + :processed_at => 2.months.ago.beginning_of_month + 1.day) + dossier_p1_b = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :created_at => 2.months.ago.beginning_of_month, + :initiated_at => 2.months.ago.beginning_of_month + 10.minutes, + :processed_at => 2.months.ago.beginning_of_month + 1.day) + dossier_p1_c = FactoryGirl.create(:dossier, + :procedure => procedure_1, + :created_at => 1.months.ago.beginning_of_month, + :initiated_at => 1.months.ago.beginning_of_month + 50.minutes, + :processed_at => 1.months.ago.beginning_of_month + 1.day) + dossier_p2_a = FactoryGirl.create(:dossier, + :procedure => procedure_2, + :created_at => 2.month.ago.beginning_of_month, + :initiated_at => 2.month.ago.beginning_of_month + 80.minutes, + :processed_at => 2.month.ago.beginning_of_month + 1.day) + + # Write directly in the DB to avoid the before_validation hook + Dossier.update_all(state: "closed") + + @expected_hash = { + "#{2.months.ago.beginning_of_month}" => 30.0, + "#{1.months.ago.beginning_of_month}" => 50.0 + } + end + + let (:association) { Dossier.where.not(:state => :draft) } + + subject { StatsController.new.send(:dossier_filling_mean_time, association) } + + it { expect(subject).to eq(@expected_hash) } + end + + describe '#avis_usage' do + let!(:dossier) { create(:dossier) } + let!(:avis_with_dossier) { create(:avis) } + let!(:dossier2) { create(:dossier) } + + before do + Timecop.freeze(Time.now) + end + + subject { StatsController.new.send(:avis_usage) } + + it { expect(subject).to match([[3.week.ago.to_i, 0], [2.week.ago.to_i, 0], [1.week.ago.to_i, 33.33]]) } + end + + describe "#avis_average_answer_time" do + before do + # 1 week ago + create(:avis, answer: "voila ma réponse", created_at: 1.week.ago + 1.day, updated_at: 1.week.ago + 2.days) # 1 day + create(:avis, created_at: 1.week.ago + 2.days) + + # 2 weeks ago + create(:avis, answer: "voila ma réponse", created_at: 2.week.ago + 1.day, updated_at: 2.week.ago + 2.days) # 1 day + create(:avis, answer: "voila ma réponse2", created_at: 2.week.ago + 3.days, updated_at: 1.week.ago + 6.days) # 10 days + create(:avis, answer: "voila ma réponse2", created_at: 2.week.ago + 2.days, updated_at: 1.week.ago + 6.days) # 11 days + create(:avis, created_at: 2.week.ago + 1.day, updated_at: 2.week.ago + 2.days) + + # 3 weeks ago + create(:avis, answer: "voila ma réponse2", created_at: 3.weeks.ago + 1.day, updated_at: 3.weeks.ago + 2.days) # 1 day + create(:avis, answer: "voila ma réponse2", created_at: 3.weeks.ago + 1.day, updated_at: 1.week.ago + 5.days) # 18 day + end + + subject { StatsController.new.send(:avis_average_answer_time) } + + it { expect(subject.count).to eq(3) } + it { is_expected.to include [1.week.ago.to_i, 1.0] } + it { is_expected.to include [2.week.ago.to_i, 7.33] } + it { is_expected.to include [3.week.ago.to_i, 9.5] } + end + + describe '#avis_answer_percentages' do + let!(:avis) { create(:avis, created_at: 2.days.ago) } + let!(:avis2) { create(:avis, answer: 'answer', created_at: 2.days.ago) } + let!(:avis3) { create(:avis, answer: 'answer', created_at: 2.days.ago) } + + subject { StatsController.new.send(:avis_answer_percentages) } + + before do + Timecop.freeze(Time.now) + end + + it { is_expected.to match [[3.week.ago.to_i, 0], [2.week.ago.to_i, 0], [1.week.ago.to_i, 66.67]] } end end diff --git a/spec/decorators/champ_decorator_spec.rb b/spec/decorators/champ_decorator_spec.rb index c8b15056c..a5a2554a4 100644 --- a/spec/decorators/champ_decorator_spec.rb +++ b/spec/decorators/champ_decorator_spec.rb @@ -34,5 +34,19 @@ describe ChampDecorator do it { is_expected.to eq '' } end end + + describe "for a date" do + let(:type_champ) { :date } + + context "when value is an ISO date" do + before { champ.update value: "2017-12-31" } + it { is_expected.to eq "31/12/2017" } + end + + context "when value is empty" do + before { champ.update value: nil } + it { is_expected.to eq nil } + end + end end end diff --git a/spec/factories/administrateur.rb b/spec/factories/administrateur.rb index 05cfc88a2..f81e5a6a9 100644 --- a/spec/factories/administrateur.rb +++ b/spec/factories/administrateur.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - sequence(:administrateur_email) { |n| "plop#{n}@plop.com" } + sequence(:administrateur_email) { |n| "admin#{n}@admin.com" } factory :administrateur do email { generate(:administrateur_email) } password 'password' diff --git a/spec/factories/avis.rb b/spec/factories/avis.rb new file mode 100644 index 000000000..7568cdfe9 --- /dev/null +++ b/spec/factories/avis.rb @@ -0,0 +1,23 @@ +FactoryGirl.define do + factory :avis do + introduction 'Bonjour, merci de me donner votre avis sur ce dossier' + + before(:create) do |avis, _evaluator| + unless avis.gestionnaire + avis.gestionnaire = create :gestionnaire + end + end + + before(:create) do |avis, _evaluator| + unless avis.dossier + avis.dossier = create :dossier + end + end + + before(:create) do |avis, _evaluator| + unless avis.claimant + avis.claimant = create :gestionnaire + end + end + end +end diff --git a/spec/factories/champ.rb b/spec/factories/champ.rb index 96620cb80..3a2302f4c 100644 --- a/spec/factories/champ.rb +++ b/spec/factories/champ.rb @@ -1,4 +1,6 @@ FactoryGirl.define do factory :champ do + + type_de_champ { FactoryGirl.create(:type_de_champ_public) } end end diff --git a/spec/factories/gestionnaire.rb b/spec/factories/gestionnaire.rb index 88043eecf..02ee8d5eb 100644 --- a/spec/factories/gestionnaire.rb +++ b/spec/factories/gestionnaire.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - sequence(:gestionnaire_email) { |n| "gest#{n}@plop.com" } + sequence(:gestionnaire_email) { |n| "gest#{n}@gest.com" } factory :gestionnaire do email { generate(:gestionnaire_email) } password 'password' diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb index f38629fc7..9e0b76e7b 100644 --- a/spec/factories/procedure.rb +++ b/spec/factories/procedure.rb @@ -30,10 +30,16 @@ FactoryGirl.define do end trait :with_type_de_champ do - after(:build) do |procedure, _evaluator| - type_de_champ = create(:type_de_champ_public) + transient do + types_de_champ_count 1 + end - procedure.types_de_champ << type_de_champ + after(:build) do |procedure, evaluator| + evaluator.types_de_champ_count.times do + type_de_champ = create(:type_de_champ_public) + + procedure.types_de_champ << type_de_champ + end end end diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 184da4b0a..c2d09396b 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - sequence(:user_email) { |n| "plop#{n}@plop.com" } + sequence(:user_email) { |n| "user#{n}@user.com" } factory :user do email { generate(:user_email) } password 'password' diff --git a/spec/mailers/avis_mailer_spec.rb b/spec/mailers/avis_mailer_spec.rb new file mode 100644 index 000000000..83673e899 --- /dev/null +++ b/spec/mailers/avis_mailer_spec.rb @@ -0,0 +1,14 @@ +require "rails_helper" + +RSpec.describe AvisMailer, type: :mailer do + describe '.avis_invitation' do + let(:avis) { create(:avis) } + + subject { described_class.avis_invitation(avis) } + + it { expect(subject.subject).to eq("Donnez votre avis sur le dossier nº #{avis.dossier.id} (#{avis.dossier.procedure.libelle})") } + it { expect(subject.body).to include("Vous avez été invité par #{avis.claimant.email} à donner votre avis sur le dossier nº #{avis.dossier.id} de la procédure : #{avis.dossier.procedure.libelle}.") } + it { expect(subject.body).to include(avis.introduction) } + + end +end diff --git a/spec/mailers/previews/avis_mailer_preview.rb b/spec/mailers/previews/avis_mailer_preview.rb new file mode 100644 index 000000000..55d153cd1 --- /dev/null +++ b/spec/mailers/previews/avis_mailer_preview.rb @@ -0,0 +1,8 @@ +# Preview all emails at http://localhost:3000/rails/mailers/avis_mailer +class AvisMailerPreview < ActionMailer::Preview + + def avis_invitation + AvisMailer.avis_invitation(Avis.last) + end + +end diff --git a/spec/mailers/previews/gestionnaire_mailer_preview.rb b/spec/mailers/previews/gestionnaire_mailer_preview.rb new file mode 100644 index 000000000..2e62b4f5c --- /dev/null +++ b/spec/mailers/previews/gestionnaire_mailer_preview.rb @@ -0,0 +1,6 @@ +class GestionnaireMailerPreview < ActionMailer::Preview + def last_week_overview + gestionnaire = Gestionnaire.first + GestionnaireMailer.last_week_overview(gestionnaire, gestionnaire.last_week_overview) + end +end diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb index 25fa735c2..3cb6079a2 100644 --- a/spec/mailers/previews/notification_mailer_preview.rb +++ b/spec/mailers/previews/notification_mailer_preview.rb @@ -1,7 +1,7 @@ class NotificationMailerPreview < ActionMailer::Preview def send_notification - NotificationMailer.send_notification(Dossier.last, Dossier.last.procedure.initiated_mail) + NotificationMailer.send_notification(Dossier.last, Dossier.last.procedure.initiated_mail_template) end end diff --git a/spec/models/avis_spec.rb b/spec/models/avis_spec.rb new file mode 100644 index 000000000..231210158 --- /dev/null +++ b/spec/models/avis_spec.rb @@ -0,0 +1,89 @@ +require 'rails_helper' + +RSpec.describe Avis, type: :model do + let(:claimant) { create(:gestionnaire) } + + describe '.email_to_display' do + let(:invited_email) { 'invited@avis.com' } + let!(:avis) do + avis = create(:avis, email: invited_email, dossier: create(:dossier)) + avis.gestionnaire = nil + avis + end + + subject { avis.email_to_display } + + context 'when gestionnaire is not known' do + it{ is_expected.to eq(invited_email) } + end + + context 'when gestionnaire is known' do + let!(:avis) { create(:avis, email: nil, gestionnaire: create(:gestionnaire), dossier: create(:dossier)) } + + it{ is_expected.to eq(avis.gestionnaire.email) } + end + end + + describe '.by_latest' do + context 'with 3 avis' do + let!(:avis){ create(:avis) } + let!(:avis2){ create(:avis, updated_at: 4.hours.ago) } + let!(:avis3){ create(:avis, updated_at: 3.hours.ago) } + + subject { Avis.by_latest } + + it { expect(subject).to eq([avis, avis3, avis2])} + end + end + + describe ".link_avis_to_gestionnaire" do + let(:gestionnaire){ create(:gestionnaire) } + + subject{ Avis.link_avis_to_gestionnaire(gestionnaire) } + + context 'when there are 2 avis linked by email to a gestionnaire' do + let!(:avis){ create(:avis, email: gestionnaire.email, gestionnaire: nil) } + let!(:avis2){ create(:avis, email: gestionnaire.email, gestionnaire: nil) } + + before do + subject + avis.reload + avis2.reload + end + + it { expect(avis.email).to be_nil } + it { expect(avis.gestionnaire).to eq(gestionnaire) } + it { expect(avis2.email).to be_nil } + it { expect(avis2.gestionnaire).to eq(gestionnaire) } + end + end + + describe '.avis_exists_and_email_belongs_to_avis' do + let(:dossier) { create(:dossier) } + let(:invited_email) { 'invited@avis.com' } + let!(:avis) { create(:avis, email: invited_email, dossier: dossier) } + + subject { Avis.avis_exists_and_email_belongs_to_avis?(avis_id, email) } + + context 'when the avis is unknown' do + let(:avis_id) { 666 } + let(:email) { 'unknown@mystery.com' } + + it { is_expected.to be false } + end + + context 'when the avis is known' do + let(:avis_id) { avis.id } + + context 'when the email belongs to the invitation' do + let(:email) { invited_email } + it { is_expected.to be true } + end + + context 'when the email is unknown' do + let(:email) { 'unknown@mystery.com' } + it { is_expected.to be false } + end + end + end +end diff --git a/spec/models/champ_shared_example.rb b/spec/models/champ_shared_example.rb index b404154df..7dfe6bb1b 100644 --- a/spec/models/champ_shared_example.rb +++ b/spec/models/champ_shared_example.rb @@ -68,4 +68,30 @@ shared_examples 'champ_spec' do it { expect(subject).to include '99 - Étranger' } end + + context "when type_champ=date" do + let(:type_de_champ) { create(:type_de_champ_public, type_champ: "date")} + let(:champ) { create(:champ, type_de_champ: type_de_champ) } + + it "should convert %d/%m/%Y format to ISO" do + champ.value = "31/12/2017" + champ.save + champ.reload + expect(champ.value).to eq("2017-12-31") + end + + it "should convert to nil if date parse failed" do + champ.value = "bla" + champ.save + champ.reload + expect(champ.value).to be(nil) + end + + it "should convert empty string to nil" do + champ.value = "" + champ.save + champ.reload + expect(champ.value).to be(nil) + end + end end diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb index e964e4b0d..ac668ee64 100644 --- a/spec/models/dossier_spec.rb +++ b/spec/models/dossier_spec.rb @@ -409,59 +409,6 @@ describe Dossier do end end end - - describe 'gestionnaire backoffice methods' do - let(:admin) { create(:administrateur) } - let(:admin_2) { create(:administrateur) } - - let(:gestionnaire) { create(:gestionnaire, administrateurs: [admin]) } - let(:procedure_admin) { create(:procedure, administrateur: admin) } - let(:procedure_admin_2) { create(:procedure, administrateur: admin_2) } - - let!(:dossier) { create(:dossier, procedure: procedure_admin, state: 'draft') } - let!(:dossier2) { create(:dossier, procedure: procedure_admin, state: 'initiated') } #nouveaux - let!(:dossier3) { create(:dossier, procedure: procedure_admin, state: 'initiated') } #nouveaux - let!(:dossier4) { create(:dossier, procedure: procedure_admin, state: 'replied') } #en_attente - let!(:dossier5) { create(:dossier, procedure: procedure_admin, state: 'updated') } #a_traiter - let!(:dossier6) { create(:dossier, procedure: procedure_admin, state: 'received') } #a_instruire - let!(:dossier7) { create(:dossier, procedure: procedure_admin, state: 'received') } #a_instruire - let!(:dossier8) { create(:dossier, procedure: procedure_admin, state: 'closed') } #termine - let!(:dossier9) { create(:dossier, procedure: procedure_admin, state: 'refused') } #termine - let!(:dossier10) { create(:dossier, procedure: procedure_admin, state: 'without_continuation') } #termine - let!(:dossier11) { create(:dossier, procedure: procedure_admin_2, state: 'closed') } #termine - let!(:dossier12) { create(:dossier, procedure: procedure_admin, state: 'initiated', archived: true) } #a_traiter #archived - let!(:dossier13) { create(:dossier, procedure: procedure_admin, state: 'replied', archived: true) } #en_attente #archived - let!(:dossier14) { create(:dossier, procedure: procedure_admin, state: 'closed', archived: true) } #termine #archived - - before do - create :assign_to, gestionnaire: gestionnaire, procedure: procedure_admin - end - - describe '#nouveaux' do - subject { gestionnaire.dossiers.nouveaux } - - it { expect(subject.size).to eq(2) } - end - - describe '#waiting_for_gestionnaire' do - subject { gestionnaire.dossiers.waiting_for_gestionnaire } - - it { expect(subject.size).to eq(1) } - end - - describe '#waiting_for_user' do - subject { gestionnaire.dossiers.waiting_for_user } - - it { expect(subject.size).to eq(1) } - end - - describe '#en_instruction' do - subject { gestionnaire.dossiers.en_instruction } - - it { expect(subject.size).to eq(2) } - it { expect(subject).to include(dossier6, dossier7) } - end - end end describe '#cerfa_available?' do @@ -911,11 +858,36 @@ describe Dossier do let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: :draft) } let!(:dossier2) { create(:dossier, :with_entreprise, procedure: procedure, state: :initiated) } let!(:dossier3) { create(:dossier, :with_entreprise, procedure: procedure, state: :received) } + let!(:dossier4) { create(:dossier, :with_entreprise, procedure: procedure, state: :received, archived: true) } subject { procedure.dossiers.downloadable } it { is_expected.not_to include(dossier)} it { is_expected.to include(dossier2)} it { is_expected.to include(dossier3)} + it { is_expected.to include(dossier4)} + end + + describe "#send_notification_email" do + let(:procedure) { create(:procedure) } + let(:dossier) { create(:dossier, procedure: procedure, state: :initiated) } + + before do + ActionMailer::Base.deliveries.clear + end + + it "sends an email when the dossier becomes received" do + dossier.received! + + mail = ActionMailer::Base.deliveries.last + + expect(mail.subject).to eq("Votre dossier TPS nº #{dossier.id} va être instruit") + end + + it "does not an email when the dossier becomes closed" do + dossier.closed! + + expect(ActionMailer::Base.deliveries.size).to eq(0) + end end end diff --git a/spec/models/gestionnaire_spec.rb b/spec/models/gestionnaire_spec.rb index 8525b2e86..fbfbfd76f 100644 --- a/spec/models/gestionnaire_spec.rb +++ b/spec/models/gestionnaire_spec.rb @@ -347,4 +347,75 @@ describe Gestionnaire, type: :model do end end end + + describe 'last_week_overview' do + let!(:gestionnaire2) { create(:gestionnaire) } + subject { gestionnaire2.last_week_overview } + let(:friday) { DateTime.new(2017, 5, 12) } + let(:monday) { DateTime.now.beginning_of_week } + + before :each do + Timecop.freeze(friday) + end + + context 'when no procedure published was active last week' do + let!(:procedure) { create(:procedure, gestionnaires: [gestionnaire2], libelle: 'procedure', published: true) } + context 'when the gestionnaire has no notifications' do + it { is_expected.to eq(nil) } + end + + context 'when the gestionnaire has one notification' do + before :each do + expect(gestionnaire2).to receive(:notifications).twice.and_return([1]) + end + + it { is_expected.to eq({ start_date: monday, procedure_overviews: [], notifications: [1] }) } + end + end + + context 'when a procedure published was active' do + let!(:procedure) { create(:procedure, gestionnaires: [gestionnaire2], libelle: 'procedure', published: true) } + let(:procedure_overview) { double('procedure_overview', 'had_some_activities?'.to_sym => true) } + + before :each do + expect_any_instance_of(Procedure).to receive(:procedure_overview).and_return(procedure_overview) + end + + it { expect(gestionnaire.last_week_overview[:procedure_overviews]).to match([procedure_overview]) } + end + + context 'when a procedure not published was active with no notifications' do + let!(:procedure) { create(:procedure, gestionnaires: [gestionnaire2], libelle: 'procedure', published: false) } + let(:procedure_overview) { double('procedure_overview', 'had_some_activities?'.to_sym => true) } + + before :each do + allow_any_instance_of(Procedure).to receive(:procedure_overview).and_return(procedure_overview) + end + + it { is_expected.to eq(nil) } + end + end + + describe '.can_view_dossier?' do + subject{ gestionnaire.can_view_dossier?(dossier.id) } + + context 'when gestionnaire is assigned on dossier' do + let!(:dossier){ create(:dossier, procedure: procedure, state: 'received') } + + it { expect(subject).to be true } + end + + context 'when gestionnaire is invited on dossier' do + let(:dossier){ create(:dossier) } + let!(:avis){ create(:avis, dossier: dossier, gestionnaire: gestionnaire) } + + it { expect(subject).to be true } + end + + context 'when gestionnaire is neither assigned nor invited on dossier' do + let(:dossier){ create(:dossier) } + + it { expect(subject).to be false } + end + end end diff --git a/spec/models/procedure_overview_spec.rb b/spec/models/procedure_overview_spec.rb new file mode 100644 index 000000000..defe51345 --- /dev/null +++ b/spec/models/procedure_overview_spec.rb @@ -0,0 +1,87 @@ +require 'spec_helper' + +describe ProcedureOverview, type: :model do + let(:procedure) { create(:procedure, libelle: 'libelle') } + let(:friday) { DateTime.new(2017, 5, 12) } # vendredi 12 mai 2017, de la semaine du 8 mai + let(:monday) { DateTime.new(2017, 5, 8) } + + before :each do + Timecop.freeze(friday) + end + + let(:procedure_overview) { ProcedureOverview.new(procedure, monday, 0) } + + describe 'received_dossiers_count' do + let!(:received_dossier) do + dossier = create(:dossier, procedure: procedure, state: :received, created_at: monday) + end + + it { expect(procedure_overview.received_dossiers_count).to eq(1) } + end + + describe 'created_dossiers_count' do + let!(:created_dossier_during_the_week) do + create(:dossier, procedure: procedure, created_at: monday, state: :received) + end + + let!(:created_dossier_during_the_week_but_in_draft) do + create(:dossier, procedure: procedure, created_at: monday, state: :draft) + end + + let!(:created_dossier_before_the_week) do + create(:dossier, procedure: procedure, created_at: (monday - 1.week), state: :received) + end + + it { expect(procedure_overview.created_dossiers_count).to eq(1) } + end + + describe 'processed_dossiers_count' do + let!(:processed_dossier_during_the_week) do + create(:dossier, procedure: procedure, created_at: monday, processed_at: monday) + end + + let!(:processed_dossier_before_the_week) do + create(:dossier, procedure: procedure, created_at: (monday - 1.week), processed_at: (monday - 1.week)) + end + + it { expect(procedure_overview.processed_dossiers_count).to eq(1) } + end + + describe 'to_html' do + subject { procedure_overview.to_html } + + context 'when the different count are equal to 0' do + it { is_expected.to match(/^libelle<\/strong><\/a>$/) } + end + + context 'when the different counts are equal to 1' do + before :each do + procedure_overview.notifications_count = 1 + procedure_overview.received_dossiers_count = 1 + procedure_overview.created_dossiers_count = 1 + procedure_overview.processed_dossiers_count = 1 + end + + it { is_expected.to match(/^libelle<\/strong><\/a>/) } + it { is_expected.to include("1 dossier est en cours d'instruction") } + it { is_expected.to include('1 nouveau dossier a été déposé') } + it { is_expected.to include('1 dossier a été instruit') } + it { is_expected.to include('1 notification en attente sur les dossiers que vous suivez') } + end + + context 'when the different counts are equal to 2' do + before :each do + procedure_overview.notifications_count = 2 + procedure_overview.received_dossiers_count = 3 + procedure_overview.created_dossiers_count = 4 + procedure_overview.processed_dossiers_count = 5 + end + + it { is_expected.to match(/^libelle<\/strong><\/a>/) } + it { is_expected.to include("3 dossiers sont en cours d'instruction") } + it { is_expected.to include('4 nouveaux dossiers ont été déposés') } + it { is_expected.to include('5 dossiers ont été instruits') } + it { is_expected.to include('2 notifications en attente sur les dossiers que vous suivez') } + end + end +end diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb index 7a5717d99..a9e3f2185 100644 --- a/spec/models/procedure_spec.rb +++ b/spec/models/procedure_spec.rb @@ -1,20 +1,21 @@ require 'spec_helper' describe Procedure do + describe 'mail templates' do + subject { create(:procedure) } - describe 'mails' do - it { expect(subject.initiated_mail).to be_a(Mails::InitiatedMail) } - it { expect(subject.received_mail).to be_a(Mails::ReceivedMail) } - it { expect(subject.closed_mail).to be_a(Mails::ClosedMail) } - it { expect(subject.refused_mail).to be_a(Mails::RefusedMail) } - it { expect(subject.without_continuation_mail).to be_a(Mails::WithoutContinuationMail) } + it { expect(subject.initiated_mail_template).to be_a(Mails::InitiatedMail) } + it { expect(subject.received_mail_template).to be_a(Mails::ReceivedMail) } + it { expect(subject.closed_mail_template).to be_a(Mails::ClosedMail) } + it { expect(subject.refused_mail_template).to be_a(Mails::RefusedMail) } + it { expect(subject.without_continuation_mail_template).to be_a(Mails::WithoutContinuationMail) } end describe 'initiated_mail' do subject { create(:procedure) } context 'when initiated_mail is not customize' do - it { expect(subject.initiated_mail.body).to eq(Mails::InitiatedMail.default.body) } + it { expect(subject.initiated_mail_template.body).to eq(Mails::InitiatedMail.default.body) } end context 'when initiated_mail is customize' do @@ -23,7 +24,7 @@ describe Procedure do subject.save subject.reload end - it { expect(subject.initiated_mail.body).to eq('sisi') } + it { expect(subject.initiated_mail_template.body).to eq('sisi') } end context 'when initiated_mail is customize ... again' do @@ -32,7 +33,7 @@ describe Procedure do subject.save subject.reload end - it { expect(subject.initiated_mail.body).to eq('toto') } + it { expect(subject.initiated_mail_template.body).to eq('toto') } it { expect(Mails::InitiatedMail.count).to eq(1) } end @@ -186,7 +187,7 @@ describe Procedure do end it 'should not duplicate default mail_template' do - expect(subject.initiated_mail.attributes).to eq Mails::InitiatedMail.default.attributes + expect(subject.initiated_mail_template.attributes).to eq Mails::InitiatedMail.default.attributes end it 'should not duplicate specific related objects' do diff --git a/spec/views/admin/gestionnaires/index.html.haml_spec.rb b/spec/views/admin/gestionnaires/index.html.haml_spec.rb index 0ec5c815b..7f8820abd 100644 --- a/spec/views/admin/gestionnaires/index.html.haml_spec.rb +++ b/spec/views/admin/gestionnaires/index.html.haml_spec.rb @@ -29,6 +29,6 @@ describe 'admin/gestionnaires/index.html.haml', type: :view do array: true)) render end - it { expect(rendered).to match(/gest\d+@plop.com/) } + it { expect(rendered).to match(/gest\d+@gest.com/) } end end diff --git a/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb b/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb index dd61a7578..308acb09c 100644 --- a/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb +++ b/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb @@ -6,6 +6,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm let(:state) { 'draft' } let(:archived) { false } let(:gestionnaire) { create(:gestionnaire) } + let!(:assign_to) { create(:assign_to, gestionnaire: gestionnaire, procedure: dossier.procedure) } before do sign_in gestionnaire diff --git a/spec/views/users/dossiers/index_html.haml_spec.rb b/spec/views/users/dossiers/index_html.haml_spec.rb index 09e787e99..3813456f8 100644 --- a/spec/views/users/dossiers/index_html.haml_spec.rb +++ b/spec/views/users/dossiers/index_html.haml_spec.rb @@ -43,7 +43,7 @@ describe 'users/dossiers/index.html.haml', type: :view do describe 'on tab en construction' do let(:total_dossiers) { 3 } let(:active_class) { '.active .text-danger' } - let(:dossiers_to_display) { user.dossiers.en_construction } + let(:dossiers_to_display) { user.dossiers.state_en_construction } let(:liste) { 'a_traiter' } it_behaves_like 'check_tab_content' do @@ -59,11 +59,10 @@ describe 'users/dossiers/index.html.haml', type: :view do end end - describe 'on tab etude en examen' do let(:total_dossiers) { 1 } let(:active_class) { '.active .text-default' } - let(:dossiers_to_display) { user.dossiers.en_instruction } + let(:dossiers_to_display) { user.dossiers.state_en_instruction } let(:liste) { 'en_instruction' } it_behaves_like 'check_tab_content' do @@ -74,7 +73,7 @@ describe 'users/dossiers/index.html.haml', type: :view do describe 'on tab etude termine' do let(:total_dossiers) { 3 } let(:active_class) { '.active .text-success' } - let(:dossiers_to_display) { user.dossiers.termine } + let(:dossiers_to_display) { user.dossiers.state_termine } let(:liste) { 'termine' } it_behaves_like 'check_tab_content' do diff --git a/spec/workers/auto_archive_procedure_worker_spec.rb b/spec/workers/auto_archive_procedure_worker_spec.rb index e67a19133..2a30fa764 100644 --- a/spec/workers/auto_archive_procedure_worker_spec.rb +++ b/spec/workers/auto_archive_procedure_worker_spec.rb @@ -1,7 +1,6 @@ require 'rails_helper' RSpec.describe AutoArchiveProcedureWorker, type: :worker do - let!(:procedure) { create(:procedure, archived: false, auto_archive_on: nil )} let!(:procedure_hier) { create(:procedure, archived: false, auto_archive_on: 1.day.ago )} let!(:procedure_aujourdhui) { create(:procedure, archived: false, auto_archive_on: Date.today )} @@ -17,11 +16,9 @@ RSpec.describe AutoArchiveProcedureWorker, type: :worker do end it { expect(procedure.archived).to eq false } - end context "when procedures have auto_archive_on set on yesterday or today" do - describe "titi" do before do subject @@ -31,12 +28,9 @@ RSpec.describe AutoArchiveProcedureWorker, type: :worker do it { expect(procedure_hier.archived).to eq true } it { expect(procedure_aujourdhui.archived).to eq true } - end - context "with dossiers" do - let!(:dossier1) { create(:dossier, procedure: procedure_hier, state: 'draft', archived: false)} let!(:dossier2) { create(:dossier, procedure: procedure_hier, state: 'initiated', archived: false)} let!(:dossier3) { create(:dossier, procedure: procedure_hier, state: 'replied', archived: false)} @@ -61,18 +55,14 @@ RSpec.describe AutoArchiveProcedureWorker, type: :worker do it { expect(dossier6.state).to eq 'closed' } it { expect(dossier7.state).to eq 'refused' } it { expect(dossier8.state).to eq 'without_continuation' } - end end context "when procedures have auto_archive_on set on future" do - before do subject end it { expect(procedure_demain.archived).to eq false } - end - end diff --git a/spec/workers/weekly_overview_worker_spec.rb b/spec/workers/weekly_overview_worker_spec.rb new file mode 100644 index 000000000..e2bff3e80 --- /dev/null +++ b/spec/workers/weekly_overview_worker_spec.rb @@ -0,0 +1,44 @@ +require 'rails_helper' + +RSpec.describe WeeklyOverviewWorker, type: :worker do + describe 'perform' do + let!(:gestionnaire) { create(:gestionnaire) } + let(:overview) { double('overview') } + let(:mailer_double) { double('mailer', deliver_now: true) } + + context 'if the feature is enabled' do + before { allow(Features).to receive(:weekly_overview).and_return(true) } + + context 'with one gestionnaire with one overview' do + before :each do + expect_any_instance_of(Gestionnaire).to receive(:last_week_overview).and_return(overview) + allow(GestionnaireMailer).to receive(:last_week_overview).and_return(mailer_double) + WeeklyOverviewWorker.new.perform + end + + it { expect(GestionnaireMailer).to have_received(:last_week_overview).with(gestionnaire, overview) } + it { expect(mailer_double).to have_received(:deliver_now) } + end + + context 'with one gestionnaire with no overviews' do + before :each do + expect_any_instance_of(Gestionnaire).to receive(:last_week_overview).and_return(nil) + allow(GestionnaireMailer).to receive(:last_week_overview) + WeeklyOverviewWorker.new.perform + end + + it { expect(GestionnaireMailer).not_to have_received(:last_week_overview) } + end + end + + context 'if the feature is disabled' do + before { allow(Features).to receive(:weekly_overview).and_return(false) } + before :each do + allow(Gestionnaire).to receive(:all) + WeeklyOverviewWorker.new.perform + end + + it { expect(Gestionnaire).not_to receive(:all) } + end + end +end