From 09d4ed760fe6f4a52db892fa7c8d462073a1c235 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 8 Apr 2024 11:45:19 +0200 Subject: [PATCH] add missing views and change position for notif --- app/assets/stylesheets/notifications.scss | 3 ++- app/views/experts/avis/procedure.html.haml | 3 +-- .../procedures/deleted_dossiers.html.haml | 3 --- .../instructeurs/procedures/show.html.haml | 8 ++++--- app/views/recherche/_hidden_dossier.html.haml | 4 ---- app/views/recherche/index.html.haml | 22 +++++++------------ 6 files changed, 16 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss index fb3923cfc..41129cfb8 100644 --- a/app/assets/stylesheets/notifications.scss +++ b/app/assets/stylesheets/notifications.scss @@ -8,7 +8,8 @@ span.notifications { background-color: $orange; } -.fr-tabs__list span.notifications { +.fr-tabs__list span.notifications, +span.notifications.absolute-right { z-index: 2; top: 5px; right: 8px; diff --git a/app/views/experts/avis/procedure.html.haml b/app/views/experts/avis/procedure.html.haml index 1c25673ba..604302fc8 100644 --- a/app/views/experts/avis/procedure.html.haml +++ b/app/views/experts/avis/procedure.html.haml @@ -40,8 +40,7 @@ %tr %td.number-col = link_to(expert_avis_path(avis.procedure, avis), class: 'cell-link') do - = dsfr_icon('fr-icon-file-text-line') - #{avis.dossier.id} + = avis.dossier.id %td= link_to(avis.dossier.user_email_for(:display), expert_avis_path(avis.procedure, avis), class: 'cell-link') %td= link_to(avis.procedure.libelle, expert_avis_path(avis.procedure, avis), class: 'cell-link') = paginate @avis, views_prefix: 'shared' diff --git a/app/views/instructeurs/procedures/deleted_dossiers.html.haml b/app/views/instructeurs/procedures/deleted_dossiers.html.haml index fbeeb4adb..b3b31961f 100644 --- a/app/views/instructeurs/procedures/deleted_dossiers.html.haml +++ b/app/views/instructeurs/procedures/deleted_dossiers.html.haml @@ -38,15 +38,12 @@ %table.table.dossiers-table.hoverable %thead %tr - %th.notification-col %th.number-col N° dossier %th Raison de suppression %th Date de suppression %tbody - @deleted_dossiers.each do |deleted_dossier| %tr - %td.text-center - = dsfr_icon('fr-icon-file-text-line') %td.number-col = deleted_dossier.dossier_id %td diff --git a/app/views/instructeurs/procedures/show.html.haml b/app/views/instructeurs/procedures/show.html.haml index 44c8b634c..29e22e223 100644 --- a/app/views/instructeurs/procedures/show.html.haml +++ b/app/views/instructeurs/procedures/show.html.haml @@ -136,12 +136,14 @@ = check_box_tag :"batch_operation[dossier_ids][]", p.dossier_id, false, data: { batch_operation_target: "input", action: "batch-operation#onCheckOne", operations: batch_operation_component.operations_for_dossier(p).join(',') }, form: dom_id(BatchOperation.new), id: dom_id(BatchOperation.new, "checkbox_#{p.dossier_id}"), aria: { label: t('views.instructeurs.dossiers.batch_operation.enabled', dossier_id: p.dossier_id) } %td.number-col - - if @not_archived_notifications_dossier_ids.include?(p.dossier_id) - %span.notifications{ 'aria-label': 'notifications' } - if p.hidden_by_administration_at.present? %span.cell-link= p.dossier_id - else - %a.cell-link{ href: path }= p.dossier_id + %a.cell-link.relative{ href: path } + = p.dossier_id + - if @not_archived_notifications_dossier_ids.include?(p.dossier_id) + %span.notifications.absolute-right{ 'aria-label': 'notifications' } + - p.columns.each do |column| %td diff --git a/app/views/recherche/_hidden_dossier.html.haml b/app/views/recherche/_hidden_dossier.html.haml index daa282d63..142a3845a 100644 --- a/app/views/recherche/_hidden_dossier.html.haml +++ b/app/views/recherche/_hidden_dossier.html.haml @@ -1,7 +1,3 @@ -%td.text-center - %p.cell-link - = dsfr_icon('fr-icon-file-text-line') - %td.number-col %p.cell-link= p.dossier_id diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml index 53a54d1e8..6e123750e 100644 --- a/app/views/recherche/index.html.haml +++ b/app/views/recherche/index.html.haml @@ -19,7 +19,6 @@ %table.table.dossiers-table.hoverable %thead %tr - %th.notification-col %th.number-col Nº dossier %th Démarche %th Demandeur @@ -36,12 +35,11 @@ %tr{ class: [p.hidden_by_administration_at.present? && "file-hidden-by-user"] } - if instructeur_and_expert_dossier - %td.text-center.cell-link - = dsfr_icon('fr-icon-file-text-line') - - if @notifications_dossier_ids.include?(p.dossier_id) - %span.notifications{ 'aria-label': 'notifications' } %td.number-col - .cell-link= p.dossier_id + .cell-link.relative + = p.dossier_id + - if @notifications_dossier_ids.include?(p.dossier_id) + %span.notifications.absolute-right{ 'aria-label': 'notifications' } %td .cell-link= procedure_libelle %td @@ -53,15 +51,11 @@ = render partial: "recherche/hidden_dossier", locals: {p: p, procedure_libelle: procedure_libelle, user_email: user_email} - else - - %td.text-center - %a.cell-link{ href: path } - = dsfr_icon('fr-icon-file-text-line') - - if @notifications_dossier_ids.include?(p.dossier_id) - %span.notifications{ 'aria-label': 'notifications' } - %td.number-col - %a.cell-link{ href: path }= p.dossier_id + %a.cell-link.relative{ href: path } + = p.dossier_id + - if @notifications_dossier_ids.include?(p.dossier_id) + %span.notifications.absolute-right{ 'aria-label': 'notifications' } %td %a.cell-link{ href: path }= procedure_libelle