add missing views and change position for notif
This commit is contained in:
parent
5155049873
commit
09d4ed760f
6 changed files with 16 additions and 27 deletions
|
@ -8,7 +8,8 @@ span.notifications {
|
||||||
background-color: $orange;
|
background-color: $orange;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fr-tabs__list span.notifications {
|
.fr-tabs__list span.notifications,
|
||||||
|
span.notifications.absolute-right {
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
top: 5px;
|
top: 5px;
|
||||||
right: 8px;
|
right: 8px;
|
||||||
|
|
|
@ -40,8 +40,7 @@
|
||||||
%tr
|
%tr
|
||||||
%td.number-col
|
%td.number-col
|
||||||
= link_to(expert_avis_path(avis.procedure, avis), class: 'cell-link') do
|
= 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.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')
|
%td= link_to(avis.procedure.libelle, expert_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||||
= paginate @avis, views_prefix: 'shared'
|
= paginate @avis, views_prefix: 'shared'
|
||||||
|
|
|
@ -38,15 +38,12 @@
|
||||||
%table.table.dossiers-table.hoverable
|
%table.table.dossiers-table.hoverable
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th.notification-col
|
|
||||||
%th.number-col N° dossier
|
%th.number-col N° dossier
|
||||||
%th Raison de suppression
|
%th Raison de suppression
|
||||||
%th Date de suppression
|
%th Date de suppression
|
||||||
%tbody
|
%tbody
|
||||||
- @deleted_dossiers.each do |deleted_dossier|
|
- @deleted_dossiers.each do |deleted_dossier|
|
||||||
%tr
|
%tr
|
||||||
%td.text-center
|
|
||||||
= dsfr_icon('fr-icon-file-text-line')
|
|
||||||
%td.number-col
|
%td.number-col
|
||||||
= deleted_dossier.dossier_id
|
= deleted_dossier.dossier_id
|
||||||
%td
|
%td
|
||||||
|
|
|
@ -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) }
|
= 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
|
%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?
|
- if p.hidden_by_administration_at.present?
|
||||||
%span.cell-link= p.dossier_id
|
%span.cell-link= p.dossier_id
|
||||||
- else
|
- 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|
|
- p.columns.each do |column|
|
||||||
%td
|
%td
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
%td.text-center
|
|
||||||
%p.cell-link
|
|
||||||
= dsfr_icon('fr-icon-file-text-line')
|
|
||||||
|
|
||||||
%td.number-col
|
%td.number-col
|
||||||
%p.cell-link= p.dossier_id
|
%p.cell-link= p.dossier_id
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
%table.table.dossiers-table.hoverable
|
%table.table.dossiers-table.hoverable
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th.notification-col
|
|
||||||
%th.number-col Nº dossier
|
%th.number-col Nº dossier
|
||||||
%th Démarche
|
%th Démarche
|
||||||
%th Demandeur
|
%th Demandeur
|
||||||
|
@ -36,12 +35,11 @@
|
||||||
|
|
||||||
%tr{ class: [p.hidden_by_administration_at.present? && "file-hidden-by-user"] }
|
%tr{ class: [p.hidden_by_administration_at.present? && "file-hidden-by-user"] }
|
||||||
- if instructeur_and_expert_dossier
|
- 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
|
%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
|
%td
|
||||||
.cell-link= procedure_libelle
|
.cell-link= procedure_libelle
|
||||||
%td
|
%td
|
||||||
|
@ -53,15 +51,11 @@
|
||||||
= render partial: "recherche/hidden_dossier", locals: {p: p, procedure_libelle: procedure_libelle, user_email: user_email}
|
= render partial: "recherche/hidden_dossier", locals: {p: p, procedure_libelle: procedure_libelle, user_email: user_email}
|
||||||
|
|
||||||
- else
|
- 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
|
%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
|
%td
|
||||||
%a.cell-link{ href: path }= procedure_libelle
|
%a.cell-link{ href: path }= procedure_libelle
|
||||||
|
|
Loading…
Reference in a new issue