From 25015a8b8bfdb16c31f9f3127769067d4b178692 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Thu, 29 Jun 2023 00:33:27 +0200 Subject: [PATCH] style(demande): modification date as badge --- .../champ_row_show_component.html.haml | 2 +- app/helpers/dossier_helper.rb | 7 +++++++ app/views/shared/dossiers/_champs.html.haml | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/components/dossiers/champ_row_show_component/champ_row_show_component.html.haml b/app/components/dossiers/champ_row_show_component/champ_row_show_component.html.haml index d6d602eb9..ba4abf1a2 100644 --- a/app/components/dossiers/champ_row_show_component/champ_row_show_component.html.haml +++ b/app/components/dossiers/champ_row_show_component/champ_row_show_component.html.haml @@ -11,7 +11,7 @@ - if updated_after_deposer?(champ) %p.fr-mb-0.fr-text--sm - %span{ class: highlight_if_unseen_class(@demande_seen_at, champ.updated_at) } + %span.fr-badge.fr-badge--sm{ class: badge_class_if_unseen(@demande_seen_at, champ.updated_at) } = t(:updated_at, scope: [:views, :shared, :dossiers, :form], datetime: try_format_datetime(champ.updated_at)) - if champ.blank? diff --git a/app/helpers/dossier_helper.rb b/app/helpers/dossier_helper.rb index 6dfeb1f40..04609abe5 100644 --- a/app/helpers/dossier_helper.rb +++ b/app/helpers/dossier_helper.rb @@ -17,6 +17,13 @@ module DossierHelper end end + def badge_class_if_unseen(seen_at, updated_at) + return if updated_at.blank? || seen_at.blank? + return if seen_at > updated_at + + "fr-badge--new" + end + def url_for_dossier(dossier) if dossier.brouillon? brouillon_dossier_path(dossier) diff --git a/app/views/shared/dossiers/_champs.html.haml b/app/views/shared/dossiers/_champs.html.haml index 1491b8ed1..89f4f1509 100644 --- a/app/views/shared/dossiers/_champs.html.haml +++ b/app/views/shared/dossiers/_champs.html.haml @@ -4,9 +4,9 @@ %p.champ-label.flex-grow= dossier.procedure.routing_criteria_name %p.fr-mb-0.fr-text--xs - - if demande_seen_at&.<(dossier.groupe_instructeur_updated_at) - %span{ class: highlight_if_unseen_class(demande_seen_at, dossier.groupe_instructeur_updated_at) } - = t(:updated_at, scope: [:views, :shared, :dossiers, :form], datetime: try_format_datetime(dossier.updated_at)) + - if demande_seen_at && dossier.groupe_instructeur_updated_at && dossier.groupe_instructeur_updated_at > dossier.depose_at + %span.fr-badge.fr-badge--sm{ class: badge_class_if_unseen(demande_seen_at, dossier.groupe_instructeur_updated_at) } + = t(:updated_at, scope: [:views, :shared, :dossiers, :form], datetime: try_format_datetime(dossier.groupe_instructeur_updated_at)) .champ-content{ class: highlight_if_unseen_class(demande_seen_at, dossier.groupe_instructeur_updated_at) } %p= dossier.groupe_instructeur.label