Merge pull request #10402 from colinux/fix-procedure-close-empty-warn

ETQ usager: pas d'alerte vide sur les anciennes démarches closes sans raison
This commit is contained in:
Colin Darie 2024-05-06 17:09:41 +00:00 committed by GitHub
commit 280467f656
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 12 deletions

View file

@ -57,15 +57,15 @@
- if dossier.brouillon? && dossier.procedure.closing_reason_internal_procedure?
= t('views.users.dossiers.dossiers_list.procedure_closed.brouillon.internal_procedure_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.procedure'), commencer_path(dossier.procedure.replaced_by_procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
- elsif dossier.brouillon? && dossier.procedure.closing_reason_other?
= t('views.users.dossiers.dossiers_list.procedure_closed.brouillon.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.here'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
= t('views.users.dossiers.dossiers_list.procedure_closed.brouillon.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.more_details'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
- elsif dossier.en_construction_ou_instruction? && dossier.procedure.closing_reason_internal_procedure?
= t('views.users.dossiers.dossiers_list.procedure_closed.en_cours.internal_procedure_html')
- elsif dossier.en_construction_ou_instruction? && dossier.procedure.closing_reason_other?
= t('views.users.dossiers.dossiers_list.procedure_closed.en_cours.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.here'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
= t('views.users.dossiers.dossiers_list.procedure_closed.en_cours.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.more_details'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
- elsif dossier.termine? && dossier.procedure.closing_reason_internal_procedure?
= t('views.users.dossiers.dossiers_list.procedure_closed.termine.internal_procedure_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.this_procedure'), commencer_path(dossier.procedure.replaced_by_procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
- elsif dossier.termine? && dossier.procedure.closing_reason_other?
= t('views.users.dossiers.dossiers_list.procedure_closed.termine.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.here'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
= t('views.users.dossiers.dossiers_list.procedure_closed.termine.other_html', link: link_to(t('views.users.dossiers.dossiers_list.procedure_closed.more_details'), closing_details_path(dossier.procedure.path), **external_link_attributes, title: new_tab_suffix(t('views.users.dossiers.dossiers_list.procedure_closed.closing_details'))).html_safe)
- if dossier.pending_correction?
= render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: "fr-mb-2w") do |c|

View file

@ -504,7 +504,6 @@ en:
no_result_reset_search: Reset search
no_result_text_with_filter: found with selected filters
no_result_reset_filter: Reset filters
procedure_closed: This procedure has been closed, you will not be able to submit a file again from the procedure link, contact your administration for more information.
pending_correction_html: "This file is waiting for your corrections. Consult the changes to be made in the <a href=\"%{link}\">messaging system</a>."
depose_at: First submission on %{date}
created_at: Created at %{date}
@ -515,15 +514,15 @@ en:
procedure_closed:
brouillon:
internal_procedure_html: This procedure is closed, you cannot submit this file. We invite you to submit a new one on the %{link} which replaces it
other_html: This process is closed, you cannot submit this file. More information %{link}
other_html: This process is closed, you cannot submit this file. %{link}
en_cours:
internal_procedure_html: This procedure is closed. Your file has been submitted and can be investigated by the administration
other_html: This procedure is closed. Your file has been submitted and can be processed by the administration. More information %{link}
other_html: This procedure is closed. Your file has been submitted and can be processed by the administration. %{link}
termine:
internal_procedure_html: This procedure is closed and replaced by %{link}. Your file has been processed by the administration
other_html: This process is closed, you cannot submit a new file. More information %{link}
other_html: This process is closed, you cannot submit a new file. %{link}
closing_details: Details on the closed procedure
here: here
more_details: More information
procedure: procedure
this_procedure: this procedure
transfers:

View file

@ -510,15 +510,15 @@ fr:
procedure_closed:
brouillon:
internal_procedure_html: Cette démarche est close, vous ne pouvez pas déposer ce dossier. Nous vous invitons à en déposer un nouveau sur la %{link} qui la remplace
other_html: Cette démarche est close, vous ne pouvez pas déposer ce dossier. Plus dinformations %{link}
other_html: Cette démarche est close, vous ne pouvez pas déposer ce dossier. %{link}
en_cours:
internal_procedure_html: Cette démarche est close. Votre dossier est bien déposé et peut être instruit par ladministration
other_html: Cette démarche est close. Votre dossier est bien déposé et peut être instruit par l'administration. Vous ne pouvez pas déposer de nouveau dossier. Plus dinformations %{link}
other_html: Cette démarche est close. Votre dossier est bien déposé et peut être instruit par l'administration. Vous ne pouvez pas déposer de nouveau dossier. %{link}
termine:
internal_procedure_html: Cette démarche est close et remplacée par %{link}. Votre dossier a été traité par l'administration
other_html: Cette démarche est close, vous ne pourrez pas déposer de nouveau dossier à partir du lien de la démarche. Plus dinformations %{link}
other_html: Cette démarche est close, vous ne pourrez pas déposer de nouveau dossier à partir du lien de la démarche. %{link}
closing_details: Détails sur la fermeture de la démarche
here: ici
more_details: Plus dinformations
procedure: démarche
this_procedure: cette démarche
pending_correction_html: "Ce dossier attend vos corrections. Consultez les modifications à apporter dans la <a href=\"%{link}\">messagerie</a>."