final optims after sim review
This commit is contained in:
kara Diaby
simon lehericey
parent
f3c4040d2d
commit
c7643154d1
12 changed files with 106 additions and 61 deletions
|
|
@ -4,6 +4,6 @@
|
|||
Bonjour,
|
||||
|
||||
%p
|
||||
= t('.body', dossier_id: @deleted_dossier.dossier_id, procedure: @deleted_dossier.procedure.libelle)
|
||||
= t('.body', dossier_id: @deleted_dossier.dossier_id, libelle_demarche: @deleted_dossier.procedure.libelle)
|
||||
|
||||
= render partial: "layouts/mailers/signature"
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
- if dossier.termine?
|
||||
%li
|
||||
= link_to supprimer_dossier_instructeur_dossier_path(dossier.procedure, dossier), method: :patch, data: { confirm: "Voulez vous vraiment supprimer le dossier #{dossier.id} ? Cette action est irréversible. \nNous vous suggérons de télécharger le dossier au format PDF au préalable." } do
|
||||
%span.icon.refuse
|
||||
%span.icon.delete
|
||||
.dropdown-description
|
||||
%h4 Supprimer le dossier
|
||||
L’usager sera notifié que son dossier sera supprimé.
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@
|
|||
%tr
|
||||
%th.notification-col
|
||||
%th.number-col N° dossier
|
||||
%th.status-col Etat
|
||||
%th.status-col Raison de suppression
|
||||
%th.status-col Date de suppression
|
||||
%tbody
|
||||
|
|
@ -62,8 +61,6 @@
|
|||
%span.icon.folder
|
||||
%td.number-col
|
||||
= deleted_dossier.dossier_id
|
||||
%td.status-col
|
||||
= status_badge(deleted_dossier.state)
|
||||
%td.reason-col
|
||||
= deletion_reason_badge(deleted_dossier.reason)
|
||||
%td.date-col.deleted-cell
|
||||
|
|
|
|||
42
app/views/users/dossiers/_deleted_dossiers_list.html.haml
Normal file
42
app/views/users/dossiers/_deleted_dossiers_list.html.haml
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
- if deleted_dossiers.present?
|
||||
%table.table.dossiers-table.hoverable
|
||||
%thead
|
||||
%tr
|
||||
%th.number-col Nº dossier
|
||||
%th Démarche
|
||||
%th Raison de suppression
|
||||
%th Date de suppression
|
||||
%tbody
|
||||
- deleted_dossiers.each do |dossier|
|
||||
- libelle_demarche = Procedure.find(dossier.procedure_id).libelle
|
||||
%tr{ data: { 'dossier-id': dossier.dossier_id } }
|
||||
%td.number-col
|
||||
= dossier.dossier_id
|
||||
%td
|
||||
= libelle_demarche
|
||||
|
||||
%td.cell-link
|
||||
= deletion_reason_badge(dossier.reason)
|
||||
%td
|
||||
= dossier.updated_at.strftime('%d/%m/%Y')
|
||||
|
||||
= paginate(deleted_dossiers)
|
||||
|
||||
- if current_user.feedbacks.empty? || current_user.feedbacks.last.created_at < 1.month.ago
|
||||
#user-satisfaction
|
||||
%h3 Que pensez-vous de la facilité d'utilisation de ce service ?
|
||||
.icons
|
||||
= link_to feedback_path(rating: Feedback.ratings.fetch(:unhappy)), data: { remote: true, method: :post } do
|
||||
%span.icon.frown
|
||||
= link_to feedback_path(rating: Feedback.ratings.fetch(:neutral)), data: { remote: true, method: :post } do
|
||||
%span.icon.meh
|
||||
= link_to feedback_path(rating: Feedback.ratings.fetch(:happy)), data: { remote: true, method: :post } do
|
||||
%span.icon.smile
|
||||
|
||||
- else
|
||||
.blank-tab
|
||||
%h2.empty-text Aucun dossier.
|
||||
%p.empty-text-details
|
||||
Pour remplir une démarche, contactez votre administration en lui demandant le lien de la démarche.
|
||||
%br
|
||||
Celui ci doit ressembler à #{APPLICATION_BASE_URL}/commencer/xxx.
|
||||
|
|
@ -11,39 +11,23 @@
|
|||
%th.sr-only Actions
|
||||
%tbody
|
||||
- dossiers.each do |dossier|
|
||||
-# check if the dossier is deleted or not
|
||||
- if dossier.try(:deleted_at).nil?
|
||||
%tr{ data: { 'dossier-id': dossier.id } }
|
||||
%td.number-col
|
||||
= link_to(url_for_dossier(dossier), class: 'cell-link', tabindex: -1) do
|
||||
%span.icon.folder
|
||||
= dossier.id
|
||||
%td
|
||||
= link_to(url_for_dossier(dossier), class: 'cell-link') do
|
||||
= procedure_libelle(dossier.procedure)
|
||||
- if dossiers.present?
|
||||
%td.cell-link
|
||||
= demandeur_dossier(dossier)
|
||||
%td.status-col
|
||||
= status_badge(dossier.state)
|
||||
%td.updated-at-col.cell-link
|
||||
= try_format_date(dossier.updated_at)
|
||||
%td.action-col
|
||||
= render partial: 'dossier_actions', locals: { dossier: dossier }
|
||||
- else
|
||||
%tr{ data: { 'dossier-id': dossier.dossier_id } }
|
||||
%td.number-col
|
||||
= dossier.dossier_id
|
||||
%td
|
||||
= dossier.procedure_id
|
||||
|
||||
- if dossiers.present?
|
||||
%td.cell-link
|
||||
= dossier.reason
|
||||
%td
|
||||
= status_badge(dossier.state)
|
||||
%td
|
||||
= dossier.updated_at.strftime('%d/%m/%Y')
|
||||
%tr{ data: { 'dossier-id': dossier.id } }
|
||||
%td.number-col
|
||||
= link_to(url_for_dossier(dossier), class: 'cell-link', tabindex: -1) do
|
||||
%span.icon.folder
|
||||
= dossier.id
|
||||
%td
|
||||
= link_to(url_for_dossier(dossier), class: 'cell-link') do
|
||||
= procedure_libelle(dossier.procedure)
|
||||
- if dossiers.present?
|
||||
%td.cell-link
|
||||
= demandeur_dossier(dossier)
|
||||
%td.status-col
|
||||
= status_badge(dossier.state)
|
||||
%td.updated-at-col.cell-link
|
||||
= try_format_date(dossier.updated_at)
|
||||
%td.action-col
|
||||
= render partial: 'dossier_actions', locals: { dossier: dossier }
|
||||
|
||||
= paginate(dossiers)
|
||||
|
||||
|
|
|
|||
|
|
@ -16,30 +16,30 @@
|
|||
%h1.page-title Dossiers
|
||||
%ul.tabs
|
||||
- if @user_dossiers.count > 0
|
||||
= tab_item('mes dossiers',
|
||||
= tab_item(t('pluralize.mes_dossiers', count: @user_dossiers.count),
|
||||
dossiers_path(statut: 'mes-dossiers'),
|
||||
active: @statut == 'mes-dossiers',
|
||||
badge: number_with_html_delimiter(@user_dossiers.count))
|
||||
|
||||
- if @dossiers_invites.count > 0
|
||||
= tab_item('dossiers invités',
|
||||
= tab_item(t('pluralize.dossiers_invites', count: @dossiers_invites.count),
|
||||
dossiers_path(statut: 'dossiers-invites'),
|
||||
active: @statut == 'dossiers-invites',
|
||||
badge: number_with_html_delimiter(@dossiers_invites.count))
|
||||
|
||||
- if @dossiers_supprimes.count > 0
|
||||
= tab_item('dossiers supprimés',
|
||||
= tab_item(t('pluralize.dossiers_supprimes', count: @dossiers_supprimes.count),
|
||||
dossiers_path(statut: 'dossiers-supprimes'),
|
||||
active: @statut == 'dossiers-supprimes',
|
||||
badge: number_with_html_delimiter(@dossiers_supprimes.count))
|
||||
|
||||
|
||||
.container
|
||||
- if @statut === "mes-dossiers"
|
||||
- if @statut == "mes-dossiers"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @user_dossiers }
|
||||
|
||||
- if @statut === "dossiers-invites"
|
||||
- if @statut == "dossiers-invites"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers_invites }
|
||||
|
||||
- if @statut === "dossiers-supprimes"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers_supprimes }
|
||||
- if @statut == "dossiers-supprimes"
|
||||
= render partial: "deleted_dossiers_list", locals: { deleted_dossiers: @dossiers_supprimes }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue