From adf75a90368fbc44826b193ee539900c85bf06bb Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Thu, 28 Nov 2024 15:50:07 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20d=C3=A9pot=20=3D>=20d=C3=A9p=C3=B4t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/models/procedure_presentation/fr.yml | 2 +- spec/models/columns/dossier_column_spec.rb | 2 +- spec/models/concerns/columns_concern_spec.rb | 4 ++-- spec/services/dossier_projection_service_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/models/procedure_presentation/fr.yml b/config/locales/models/procedure_presentation/fr.yml index f02ba070f..a17cc75f8 100644 --- a/config/locales/models/procedure_presentation/fr.yml +++ b/config/locales/models/procedure_presentation/fr.yml @@ -9,7 +9,7 @@ fr: state: État du dossier created_at: Date de création updated_at: Date du dernier évènement - depose_at: Date de dépot + depose_at: Date de dépôt en_construction_at: Date de passage en construction en_instruction_at: Date de passage en instruction processed_at: Date de traitement diff --git a/spec/models/columns/dossier_column_spec.rb b/spec/models/columns/dossier_column_spec.rb index 6574732c0..46d39461a 100644 --- a/spec/models/columns/dossier_column_spec.rb +++ b/spec/models/columns/dossier_column_spec.rb @@ -62,7 +62,7 @@ describe Columns::DossierColumn do expect(procedure.find_column(label: "Association date de publication").value(dossier)).to eq(nil) expect(procedure.find_column(label: "Date de création").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) expect(procedure.find_column(label: "Date du dernier évènement").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) - expect(procedure.find_column(label: "Date de dépot").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) + expect(procedure.find_column(label: "Date de dépôt").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) expect(procedure.find_column(label: "Date de passage en construction").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) expect(procedure.find_column(label: "Date de passage en instruction").value(dossier)).to be_an_instance_of(ActiveSupport::TimeWithZone) expect(procedure.find_column(label: "Date de traitement").value(dossier)).to eq(nil) diff --git a/spec/models/concerns/columns_concern_spec.rb b/spec/models/concerns/columns_concern_spec.rb index 8d68c87f2..3cc07308b 100644 --- a/spec/models/concerns/columns_concern_spec.rb +++ b/spec/models/concerns/columns_concern_spec.rb @@ -46,7 +46,7 @@ describe ColumnsConcern do { label: 'notifications', table: 'notifications', column: 'notifications', displayable: true, type: :text, filterable: false }, { label: 'Date de création', table: 'self', column: 'created_at', displayable: true, type: :date, filterable: true }, { label: 'Mis à jour le', table: 'self', column: 'updated_at', displayable: true, type: :date, filterable: true }, - { label: 'Date de dépot', table: 'self', column: 'depose_at', displayable: true, type: :date, filterable: true }, + { label: 'Date de dépôt', table: 'self', column: 'depose_at', displayable: true, type: :date, filterable: true }, { label: 'En construction le', table: 'self', column: 'en_construction_at', displayable: true, type: :date, filterable: true }, { label: 'En instruction le', table: 'self', column: 'en_instruction_at', displayable: true, type: :date, filterable: true }, { label: 'Terminé le', table: 'self', column: 'processed_at', displayable: true, type: :date, filterable: true }, @@ -242,7 +242,7 @@ describe ColumnsConcern do procedure.find_column(label: "État du dossier"), procedure.find_column(label: "Date du dernier évènement"), procedure.find_column(label: "Date de dernière modification (usager)"), - procedure.find_column(label: "Date de dépot"), + procedure.find_column(label: "Date de dépôt"), procedure.find_column(label: "Date de passage en instruction"), procedure.find_column(label: "Date de traitement"), procedure.find_column(label: "Motivation de la décision"), diff --git a/spec/services/dossier_projection_service_spec.rb b/spec/services/dossier_projection_service_spec.rb index 0cf12fcef..e55a72734 100644 --- a/spec/services/dossier_projection_service_spec.rb +++ b/spec/services/dossier_projection_service_spec.rb @@ -94,7 +94,7 @@ describe DossierProjectionService do end context 'for depose_at column' do - let(:label) { 'Date de dépot' } + let(:label) { 'Date de dépôt' } let(:dossier) { create(:dossier, :en_construction, depose_at: Time.zone.local(2018, 10, 17), procedure:) } it { is_expected.to eq('17/10/2018') } From 0230d948bc6c9ff854afff151a5ff2e067b4e827 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Thu, 28 Nov 2024 15:50:37 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix(typo):=20s=C3=A9letionner=20=3D>=20s?= =?UTF-8?q?=C3=A9lectionner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../export_dropdown_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml b/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml index 46b89fab0..4c82dd15e 100644 --- a/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml +++ b/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml @@ -17,7 +17,7 @@ = form_with url: download_export_path, namespace: "export#{@count}", data: { turbo_method: :post, turbo: true } do |f| = f.hidden_field :statut, value: @statut %fieldset.fr-fieldset#radio-hint{ "aria-labelledby": "radio-hint-legend" } - %legend.fr-fieldset__legend--regular.fr-fieldset__legend#radio-hint-legend Séletionner le format de l'export + %legend.fr-fieldset__legend--regular.fr-fieldset__legend#radio-hint-legend Sélectionner le format de l'export .fr-fieldset__element .fr-radio-group = f.radio_button :export_format, 'xlsx'