Merge branch 'main' into 8054-a11y-ways-of-navigating
This commit is contained in:
Julie Salha
GitHub
commit
b50698a30d
278 changed files with 4369 additions and 2838 deletions
|
|
@ -2,7 +2,7 @@
|
|||
%span.fr-h6.fr-mr-2w
|
||||
= page_entries_info dossiers
|
||||
.fr-table.fr-table--bordered.fr-table--no-caption.fr-mt-2w
|
||||
%table.table.dossiers-table.hoverable
|
||||
%table.table.dossiers-table.hoverable.hack-to-display-dropdown
|
||||
%caption= t('views.users.dossiers.dossiers_list.caption')
|
||||
%thead
|
||||
%tr
|
||||
|
|
@ -46,9 +46,16 @@
|
|||
= paginate dossiers, views_prefix: 'shared'
|
||||
|
||||
- else
|
||||
.blank-tab
|
||||
%h2.empty-text Aucun dossier
|
||||
%p.empty-text-details
|
||||
Pour remplir une démarche, contactez votre administration en lui demandant le lien de la démarche.
|
||||
%br
|
||||
Celui ci doit ressembler à #{APPLICATION_BASE_URL}/commencer/xxx.
|
||||
- if filter.filter_params.present?
|
||||
.blank-tab
|
||||
%h2.empty-text= t('views.users.dossiers.dossiers_list.no_result_title')
|
||||
%p.empty-text-details
|
||||
= t('views.users.dossiers.dossiers_list.no_result_text_with_filter')
|
||||
%br
|
||||
= link_to t('views.users.dossiers.dossiers_list.no_result_reset_filter'), dossiers_path(statut: statut), class: 'fr-btn fr-btn--sm fr-mt-2w'
|
||||
|
||||
- else
|
||||
.blank-tab
|
||||
%h2.empty-text= t('views.users.dossiers.dossiers_list.no_result_title')
|
||||
%p.empty-text-details
|
||||
= t('views.users.dossiers.dossiers_list.no_result_text_html', app_base: APPLICATION_BASE_URL)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@
|
|||
.dossier-container.mb-4
|
||||
= render partial: 'users/dossiers/show/header', locals: { dossier: @dossier }
|
||||
|
||||
- if @dossier.en_construction?
|
||||
.fr-container
|
||||
.fr-grid-row.fr-grid-row--center
|
||||
.fr-col-md-10.fr-col-lg-9
|
||||
= render Dossiers::EnConstructionNotSubmittedComponent.new(dossier: @dossier, user: current_user)
|
||||
|
||||
= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil, profile: 'usager' }
|
||||
|
||||
.container
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@
|
|||
= render partial: "dossiers_list", locals: { dossiers: @dossiers }
|
||||
|
||||
- else
|
||||
= render Dossiers::UserFilterComponent.new(statut: @statut, filter: @filter)
|
||||
|
||||
- if @statut == "en-cours"
|
||||
- if @first_brouillon_recently_updated.present?
|
||||
= render Dsfr::CalloutComponent.new(title: t('users.dossiers.header.callout.first_brouillon_recently_updated_title'), heading_level: 'h2') do |c|
|
||||
|
|
@ -76,13 +78,13 @@
|
|||
= 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'
|
||||
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers }
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }
|
||||
|
||||
- if @statut == "traites"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers }
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }
|
||||
|
||||
- if @statut == "dossiers-invites"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers }
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }
|
||||
|
||||
- if @statut == "dossiers-supprimes-recemment"
|
||||
= render partial: "hidden_dossiers_list", locals: { hidden_dossiers: @dossiers }
|
||||
|
|
@ -95,4 +97,4 @@
|
|||
= render partial: "transfered_dossiers_list", locals: { dossier_transfers: @dossiers }
|
||||
|
||||
- if @statut == "dossiers-expirant"
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers }
|
||||
= render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
.dossier-container.mb-4
|
||||
= render partial: 'users/dossiers/show/header', locals: { dossier: @dossier }
|
||||
|
||||
.container
|
||||
.fr-container
|
||||
= render partial: 'users/dossiers/show/status_overview', locals: { dossier: @dossier }
|
||||
= render partial: 'users/dossiers/show/papertrail', locals: { dossier: @dossier }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,80 +1,87 @@
|
|||
.status-overview
|
||||
.fr-mb-4w
|
||||
- if !dossier.termine?
|
||||
%ul.status-timeline
|
||||
- if dossier.brouillon?
|
||||
%li.brouillon{ class: dossier.brouillon? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_draft')
|
||||
%li.en-construction{ class: dossier.en_construction? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_in_progress')
|
||||
%li.en-instruction{ class: dossier.en_instruction? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_review')
|
||||
%li.termine{ class: dossier.termine? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_completed')
|
||||
.fr-grid-row.fr-grid-row--center
|
||||
.fr-col-md-8.text-center
|
||||
%ul.status-timeline.fr-mb-4w
|
||||
- if dossier.brouillon?
|
||||
%li.brouillon{ class: dossier.brouillon? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_draft')
|
||||
%li.en-construction{ class: dossier.en_construction? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_in_progress')
|
||||
%li.en-instruction{ class: dossier.en_instruction? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_review')
|
||||
%li.termine{ class: dossier.termine? ? 'active' : nil }
|
||||
= t('views.users.dossiers.show.status_overview.status_completed')
|
||||
|
||||
- if dossier.en_construction?
|
||||
.fr-grid-row.fr-grid-row--center
|
||||
.fr-col-md-10.fr-col-lg-9
|
||||
= render Dossiers::EnConstructionNotSubmittedComponent.new(dossier: dossier, user: current_user)
|
||||
|
||||
.fr-grid-row.fr-grid-row--center
|
||||
.fr-col-md-10.fr-col-lg-9.status-explanation
|
||||
-# brouillon does not occure
|
||||
- if dossier.en_construction?
|
||||
.en-construction
|
||||
%p{ role: 'status' }
|
||||
= t('views.users.dossiers.show.status_overview.en_construction_html')
|
||||
|
||||
= render partial: 'users/dossiers/show/estimated_delay', locals: { procedure: dossier.procedure }
|
||||
|
||||
%p
|
||||
= t('views.users.dossiers.show.status_overview.use_mailbox_for_questions_html', mailbox_url: messagerie_dossier_url(dossier))
|
||||
|
||||
- elsif dossier.en_instruction?
|
||||
.en-instruction
|
||||
%p{ role: 'status' }
|
||||
= t('views.users.dossiers.show.status_overview.admin_review')
|
||||
|
||||
= render partial: 'users/dossiers/show/estimated_delay', locals: { procedure: dossier.procedure }
|
||||
|
||||
%p
|
||||
= t('views.users.dossiers.show.status_overview.use_mailbox_for_questions_html', mailbox_url: messagerie_dossier_url(dossier))
|
||||
|
||||
- elsif dossier.accepte?
|
||||
.accepte
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.accept
|
||||
= t('views.users.dossiers.show.status_overview.acceptee_html')
|
||||
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.accepte_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
|
||||
- if dossier.attestation.present?
|
||||
.action
|
||||
= link_to attestation_dossier_path(dossier), target: '_blank', rel: 'noopener', class: 'button primary' do
|
||||
%span.icon.download-white
|
||||
= t('views.users.dossiers.show.status_overview.accepte_attestation')
|
||||
|
||||
|
||||
.status-explanation
|
||||
-# brouillon does not occure
|
||||
- if dossier.en_construction?
|
||||
.en-construction
|
||||
%p{ role: 'status' }
|
||||
= t('views.users.dossiers.show.status_overview.en_construction_html')
|
||||
- elsif dossier.refuse?
|
||||
.refuse
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.refuse
|
||||
= t('views.users.dossiers.show.status_overview.refuse_html')
|
||||
|
||||
= render partial: 'users/dossiers/show/estimated_delay', locals: { procedure: dossier.procedure }
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.refuse_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
|
||||
%p
|
||||
= t('views.users.dossiers.show.status_overview.use_mailbox_for_questions_html', mailbox_url: messagerie_dossier_url(dossier))
|
||||
|
||||
- elsif dossier.en_instruction?
|
||||
.en-instruction
|
||||
%p{ role: 'status' }
|
||||
= t('views.users.dossiers.show.status_overview.admin_review')
|
||||
|
||||
= render partial: 'users/dossiers/show/estimated_delay', locals: { procedure: dossier.procedure }
|
||||
|
||||
%p
|
||||
= t('views.users.dossiers.show.status_overview.use_mailbox_for_questions_html', mailbox_url: messagerie_dossier_url(dossier))
|
||||
|
||||
- elsif dossier.accepte?
|
||||
.accepte
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.accept
|
||||
= t('views.users.dossiers.show.status_overview.acceptee_html')
|
||||
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.accepte_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
|
||||
- if dossier.attestation.present?
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
.action
|
||||
= link_to attestation_dossier_path(dossier), target: '_blank', rel: 'noopener', class: 'button primary' do
|
||||
%span.icon.download-white
|
||||
= t('views.users.dossiers.show.status_overview.accepte_attestation')
|
||||
= link_to t('views.users.dossiers.show.status_overview.refuse_reply'), messagerie_dossier_url(dossier, anchor: 'new_commentaire'), class: 'fr-link'
|
||||
|
||||
- elsif dossier.sans_suite?
|
||||
.sans-suite
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.without-continuation
|
||||
= t('views.users.dossiers.show.status_overview.sans_suite_html')
|
||||
|
||||
- elsif dossier.refuse?
|
||||
.refuse
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.refuse
|
||||
= t('views.users.dossiers.show.status_overview.refuse_html')
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.refuse_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
.action
|
||||
= link_to t('views.users.dossiers.show.status_overview.refuse_reply'), messagerie_dossier_url(dossier, anchor: 'new_commentaire'), class: 'fr-link'
|
||||
|
||||
- elsif dossier.sans_suite?
|
||||
.sans-suite
|
||||
%p.decision{ role: 'status' }
|
||||
%span.icon.without-continuation
|
||||
= t('views.users.dossiers.show.status_overview.sans_suite_html')
|
||||
|
||||
= render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
|
||||
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.sans_suite_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
- if dossier.motivation.present?
|
||||
%h3= t('views.users.dossiers.show.status_overview.sans_suite_motivation')
|
||||
%blockquote= dossier.motivation
|
||||
|
|
|
|||
|
|
@ -4,8 +4,14 @@
|
|||
= turbo_stream.hide_all(@to_hide)
|
||||
- @to_update.each do |champ|
|
||||
= fields_for champ.input_name, champ do |form|
|
||||
= turbo_stream.replace champ.input_group_id do
|
||||
= render EditableChamp::EditableChampComponent.new champ:, form:
|
||||
- if champ.refresh_after_update?
|
||||
= turbo_stream.replace champ.input_group_id do
|
||||
= render EditableChamp::EditableChampComponent.new champ:, form:
|
||||
- else
|
||||
= turbo_stream.update champ.labelledby_id do
|
||||
= render EditableChamp::ChampLabelContentComponent.new champ:
|
||||
|
||||
= turbo_stream.remove_all(".editable-champ .spinner-removable");
|
||||
= turbo_stream.hide_all(".editable-champ .spinner");
|
||||
= turbo_stream.replace_all '.dossier-edit-sticky-footer' do
|
||||
= render Dossiers::EditFooterComponent.new(dossier: @dossier, annotation: false)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue