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

feebacks PR Colin part 2

Browse source
This commit is contained in:
Lisa Durand 2023-07-06 17:36:28 +02:00
parent 0a0665bb4d
commit b43889146f
4 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/card.scss
View file

@ -4,7 +4,7 @@
.card { .card {
padding: ($default-spacer * 3) ($default-spacer * 2); padding: ($default-spacer * 3) ($default-spacer * 2);
border: 1px solid $border-grey; border: 1px solid $border-grey;
margin-bottom: $default-spacer * 2; margin-bottom: $default-spacer * 4;
background: #FFFFFF; background: #FFFFFF;
.card-title { .card-title {

2
app/views/users/dossiers/_deleted_dossiers_list.html.haml
View file

@ -19,7 +19,7 @@
= t('views.users.dossiers.dossiers_list.n_dossier') = t('views.users.dossiers.dossiers_list.n_dossier')
= dossier.dossier_id = dossier.dossier_id
%span.fr-badge.fr-badge--warning %span.fr-badge.fr-badge--sm.fr-badge--warning
= t('views.users.dossiers.dossiers_list.deleted_badge') = t('views.users.dossiers.dossiers_list.deleted_badge')
= paginate deleted_dossiers, views_prefix: 'shared' = paginate deleted_dossiers, views_prefix: 'shared'

4
app/views/users/dossiers/_dossiers_list.html.haml
View file

@ -42,7 +42,7 @@
= dossier.id = dossier.id
- if @statut == "dossiers-supprimes-recemment" - if @statut == "dossiers-supprimes-recemment"
%span.fr-badge.fr-badge--warning %span.fr-badge.fr-badge--sm.fr-badge--warning
= t('views.users.dossiers.dossiers_list.deleted_badge') = t('views.users.dossiers.dossiers_list.deleted_badge')
- else - else
= status_badge(dossier.state, 'fr-mb-1w') = status_badge(dossier.state, 'fr-mb-1w')
@ -51,7 +51,7 @@
%br %br
= pending_correction_badge(:for_user) = pending_correction_badge(:for_user)
- if dossier.procedure.close? - if dossier.procedure.close? && !dossier.termine?
= render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c| = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c|
- c.body do - c.body do
%p %p

36
app/views/users/dossiers/index.html.haml
View file

@ -63,23 +63,25 @@
badge: number_with_html_delimiter(@dossier_transferes.count)) badge: number_with_html_delimiter(@dossier_transferes.count))
.fr-container .fr-container
- if @statut == "en-cours" .fr-grid-row.fr-grid-row--center
- if @first_brouillon_recently_updated.present? .fr-col-xl-10
= render Dsfr::CalloutComponent.new(title: t('users.dossiers.header.callout.first_brouillon_recently_updated_title'), heading_level: 'h2') do |c| - if @statut == "en-cours"
- c.with_body do - if @first_brouillon_recently_updated.present?
%p = render Dsfr::CalloutComponent.new(title: t('users.dossiers.header.callout.first_brouillon_recently_updated_title'), heading_level: 'h2') do |c|
= t('users.dossiers.header.callout.first_brouillon_recently_updated_text', time_ago: time_ago_in_words(@first_brouillon_recently_updated.created_at), libelle: @first_brouillon_recently_updated.procedure.libelle ) - c.with_body do
= link_to t('users.dossiers.header.callout.first_brouillon_recently_updated_button'), url_for_dossier(@first_brouillon_recently_updated), class: 'fr-btn' %p
= t('users.dossiers.header.callout.first_brouillon_recently_updated_text', time_ago: time_ago_in_words(@first_brouillon_recently_updated.created_at), libelle: @first_brouillon_recently_updated.procedure.libelle )
= link_to t('users.dossiers.header.callout.first_brouillon_recently_updated_button'), url_for_dossier(@first_brouillon_recently_updated), class: 'fr-btn'
- if @search_terms.present? - if @search_terms.present?
%h2.page-title Résultat de la recherche pour « #{@search_terms} » %h2.page-title Résultat de la recherche pour « #{@search_terms} »
= render partial: "dossiers_list", locals: { dossiers: @dossiers } = render partial: "dossiers_list", locals: { dossiers: @dossiers }
- else - else
= render Dossiers::UserFilterComponent.new(statut: @statut, filter: @filter) = render Dossiers::UserFilterComponent.new(statut: @statut, filter: @filter)
- if @statut == "dossiers-supprimes-definitivement" - if @statut == "dossiers-supprimes-definitivement"
-# /!\ in this context, @dossiers is a collection of DeletedDossier not Dossier -# /!\ in this context, @dossiers is a collection of DeletedDossier not Dossier
= render partial: "deleted_dossiers_list", locals: { deleted_dossiers: @dossiers } = render partial: "deleted_dossiers_list", locals: { deleted_dossiers: @dossiers }
- else - else
= render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut } = render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }