use dsfr table for transfer receiver view
This commit is contained in:
parent
3d5bf40c0f
commit
507d01dd44
7 changed files with 54 additions and 39 deletions
|
@ -157,6 +157,10 @@
|
||||||
word-wrap: normal !important;
|
word-wrap: normal !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ml-auto {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
// generate spacer utility like bootstrap my-2 -> margin-left/right: 2 * $default-spacer
|
// generate spacer utility like bootstrap my-2 -> margin-left/right: 2 * $default-spacer
|
||||||
// using $direction.key as css modifier, $direction.values to set css properties
|
// using $direction.key as css modifier, $direction.values to set css properties
|
||||||
// scale it using $steps
|
// scale it using $steps
|
||||||
|
|
|
@ -8,10 +8,6 @@
|
||||||
padding: (2 * $default-spacer) $default-spacer;
|
padding: (2 * $default-spacer) $default-spacer;
|
||||||
}
|
}
|
||||||
|
|
||||||
td {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
a {
|
||||||
background-image: none; // remove DSFR underline
|
background-image: none; // remove DSFR underline
|
||||||
}
|
}
|
||||||
|
@ -91,3 +87,7 @@
|
||||||
background-color: rgba(242, 137, 0, 0.6) !important;
|
background-color: rgba(242, 137, 0, 0.6) !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
table.display-table {
|
||||||
|
display: table;
|
||||||
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
- if has_actions
|
- if has_actions
|
||||||
= render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: {class: 'invite-user-actions'}, menu_options: {id: dom_id(dossier, :actions_menu)}, button_options: {class: 'fr-btn--sm fr-btn--secondary'}) do |menu|
|
= render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: {class: 'invite-user-actions'}, menu_options: {id: dom_id(dossier, :actions_menu)}, button_options: {class: 'fr-btn--sm'}) do |menu|
|
||||||
- menu.with_button_inner_html do
|
- menu.with_button_inner_html do
|
||||||
= t('views.users.dossiers.dossier_action.actions')
|
= t('views.users.dossiers.dossier_action.actions')
|
||||||
|
|
||||||
|
|
|
@ -10,15 +10,17 @@
|
||||||
%th{ scope: :col }= t('views.users.dossiers.dossiers_list.requester')
|
%th{ scope: :col }= t('views.users.dossiers.dossiers_list.requester')
|
||||||
%th.status-col{ scope: :col }= t('views.users.dossiers.dossiers_list.status')
|
%th.status-col{ scope: :col }= t('views.users.dossiers.dossiers_list.status')
|
||||||
%th.updated-at-col{ scope: :col }= t('views.users.dossiers.dossiers_list.updated')
|
%th.updated-at-col{ scope: :col }= t('views.users.dossiers.dossiers_list.updated')
|
||||||
%th.sr-only{ scope: :col }= t('views.users.dossiers.dossiers_list.actions')
|
%th.action-col.follow-col{ scope: :col }= t('views.users.dossiers.dossiers_list.actions')
|
||||||
%tbody
|
%tbody
|
||||||
- dossiers.each do |dossier|
|
- dossiers.each do |dossier|
|
||||||
- if dossier.transfer.present?
|
- if dossier.transfer.present?
|
||||||
%tr.fr-background-alt--blue-france.no-border
|
%tr.fr-background-alt--blue-france.no-border
|
||||||
%td.fr-py-2w.text-center{ colspan: 100 }
|
%td.fr-py-2w{ colspan: 100 }
|
||||||
%p
|
.flex.align-center
|
||||||
%small
|
%p.fr-mb-0
|
||||||
= t('views.users.dossiers.transfers.demande_en_cours', id: dossier.id, email: dossier.transfer.email)
|
%small
|
||||||
|
= t('views.users.dossiers.transfers.sender_demande_en_cours', id: dossier.id, email: dossier.transfer.email)
|
||||||
|
.ml-auto
|
||||||
= link_to t('views.users.dossiers.transfers.revoke'), transfer_path(dossier.transfer), class: 'fr-btn fr-btn--sm fr-btn--tertiary-no-outline', method: :delete
|
= link_to t('views.users.dossiers.transfers.revoke'), transfer_path(dossier.transfer), class: 'fr-btn fr-btn--sm fr-btn--tertiary-no-outline', method: :delete
|
||||||
|
|
||||||
%tr{ data: { 'dossier-id': dossier.id } }
|
%tr{ data: { 'dossier-id': dossier.id } }
|
||||||
|
@ -36,7 +38,7 @@
|
||||||
= status_badge(dossier.state)
|
= status_badge(dossier.state)
|
||||||
%td.updated-at-col.cell-link
|
%td.updated-at-col.cell-link
|
||||||
= try_format_date(dossier.updated_at)
|
= try_format_date(dossier.updated_at)
|
||||||
%td.action-col
|
%td.action-col.follow-col
|
||||||
= render partial: 'dossier_actions', locals: { dossier: dossier }
|
= render partial: 'dossier_actions', locals: { dossier: dossier }
|
||||||
|
|
||||||
= paginate(dossiers)
|
= paginate(dossiers)
|
||||||
|
|
|
@ -1,31 +1,34 @@
|
||||||
- if dossier_transfers.present?
|
- if dossier_transfers.present?
|
||||||
%ul.dossiers-transfers.mb-2
|
.fr-table.fr-table--bordered
|
||||||
- dossier_transfers.each do |transfer|
|
%table.table.dossiers-table.display-table
|
||||||
%li.mb-4
|
%thead
|
||||||
.transfer-details.mb-2
|
%tr
|
||||||
Demande de transfert Nº #{transfer.id} envoyé par #{transfer.dossiers.first.user.email}
|
%th.number-col= t('views.users.dossiers.dossiers_list.n_dossier')
|
||||||
%table.table.dossiers-table.hoverable
|
%th= t('views.users.dossiers.dossiers_list.procedure')
|
||||||
%thead
|
%th= t('views.users.dossiers.dossiers_list.status')
|
||||||
%tr
|
%th.action-col.follow-col Date de dépot
|
||||||
%th.number-col= t('views.users.dossiers.dossiers_list.n_dossier')
|
%tbody
|
||||||
%th= t('views.users.dossiers.dossiers_list.procedure')
|
- dossier_transfers.each do |transfer|
|
||||||
%th= t('views.users.dossiers.dossiers_list.status')
|
- transfer.dossiers.each do |dossier|
|
||||||
%th Date de dépot
|
%tr.fr-background-alt--blue-france.no-border
|
||||||
%tbody
|
%td.fr-py-2w{ colspan: 100 }
|
||||||
- transfer.dossiers.each do |dossier|
|
.flex.align-center
|
||||||
%tr{ data: { 'transfer-id': transfer.id } }
|
%p.fr-mb-0
|
||||||
%td.number-col
|
%small
|
||||||
%span.icon.folder
|
= t('views.users.dossiers.transfers.receiver_demande_en_cours', id: dossier.id, email: transfer.dossiers.first.user.email)
|
||||||
= dossier.id
|
.ml-auto
|
||||||
%td= dossier.procedure.libelle
|
= link_to t('views.users.dossiers.transfers.accept'), transfer_path(transfer), class: "fr-btn fr-btn--sm fr-btn--tertiary", method: :put
|
||||||
%td= status_badge(dossier.state)
|
|
||||||
%td{ style: 'padding: 18px;' }= (dossier.depose_at || dossier.created_at).strftime('%d/%m/%Y')
|
|
||||||
|
|
||||||
.transfer-actions.mt-4
|
= link_to t('views.users.dossiers.transfers.reject'), transfer_path(transfer), class: "fr-btn fr-btn--sm fr-btn--tertiary-no-outline", method: :delete
|
||||||
= link_to "Accepter", transfer_path(transfer), class: "button primary", method: :put
|
%tr{ data: { 'transfer-id': transfer.id } }
|
||||||
= link_to "Rejeter", transfer_path(transfer), class: "button danger", method: :delete
|
%th.number-col{ scope: :row }
|
||||||
|
%span.icon.folder
|
||||||
|
= dossier.id
|
||||||
|
%td= dossier.procedure.libelle
|
||||||
|
%td= status_badge(dossier.state)
|
||||||
|
%td.action-col.follow-col{ style: 'padding: 18px;' }= (dossier.depose_at || dossier.created_at).strftime('%d/%m/%Y')
|
||||||
|
|
||||||
= paginate(dossier_transfers)
|
= paginate(dossier_transfers)
|
||||||
|
|
||||||
- else
|
- else
|
||||||
.blank-tab
|
.blank-tab
|
||||||
|
|
|
@ -358,8 +358,11 @@ en:
|
||||||
updated: "Updated"
|
updated: "Updated"
|
||||||
actions: "Actions"
|
actions: "Actions"
|
||||||
transfers:
|
transfers:
|
||||||
demande_en_cours: "Une demande de transfert est en cours sur le dossier %{id} pour %{email}"
|
sender_demande_en_cours: "A transfer request is pending on file Nº %{id} to %{email}"
|
||||||
revoke: Révoquer cette demande
|
receiver_demande_en_cours: "Transfer request on file Nº %{id} sent by %{email}"
|
||||||
|
revoke: Revoke this request
|
||||||
|
accept: Accept
|
||||||
|
reject: Reject
|
||||||
dossier_action:
|
dossier_action:
|
||||||
edit_dossier: "Edit the file"
|
edit_dossier: "Edit the file"
|
||||||
start_other_dossier: "Start another empty file"
|
start_other_dossier: "Start another empty file"
|
||||||
|
|
|
@ -362,8 +362,11 @@ fr:
|
||||||
edit_draft: "Modifier le brouillon"
|
edit_draft: "Modifier le brouillon"
|
||||||
actions: "Actions"
|
actions: "Actions"
|
||||||
transfers:
|
transfers:
|
||||||
demande_en_cours: "Une demande de transfert est en cours sur le dossier %{id} pour %{email}"
|
sender_demande_en_cours: "Une demande de transfert est en cours sur le dossier Nº %{id} pour %{email}"
|
||||||
|
receiver_demande_en_cours: "Demande de transfert pour le dossier Nº %{id} envoyé par %{email}"
|
||||||
revoke: Révoquer cette demande
|
revoke: Révoquer cette demande
|
||||||
|
accept: Accepter
|
||||||
|
reject: Rejeter
|
||||||
sessions:
|
sessions:
|
||||||
new:
|
new:
|
||||||
sign_in: Connexion à %{application_name}
|
sign_in: Connexion à %{application_name}
|
||||||
|
|
Loading…
Reference in a new issue