From 9634cce8cd769a63036cd56da721f89205954d28 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 14:55:28 +0200 Subject: [PATCH 01/18] page presentation --- app/views/administrateurs/procedures/edit.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/administrateurs/procedures/edit.html.haml b/app/views/administrateurs/procedures/edit.html.haml index 137932e3a..f79244721 100644 --- a/app/views/administrateurs/procedures/edit.html.haml +++ b/app/views/administrateurs/procedures/edit.html.haml @@ -3,7 +3,7 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Description']] } + ['Présentation']] } = render NestedForms::FormOwnerComponent.new = form_for @procedure, @@ -12,7 +12,7 @@ .fr-container .fr-grid-row .fr-col-12.fr-col-offset-md-2.fr-col-md-8 - %h1.fr-h2 Description + %h1.fr-h2 Présentation = render partial: 'administrateurs/procedures/informations', locals: { f: f } @@ -23,6 +23,6 @@ .fr-col-12.fr-col-offset-md-2.fr-col-md-8 %ul.fr-btns-group.fr-btns-group--inline-md %li - = f.button 'Enregistrer', class: 'fr-btn' + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} %li - = link_to 'Annuler', admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + = f.button 'Enregistrer', class: 'fr-btn' From 10ac3fe693147181cf8efaffa217412fa5a2a276 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 15:09:37 +0200 Subject: [PATCH 02/18] page champs formulaire --- app/views/administrateurs/procedures/champs.html.haml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/administrateurs/procedures/champs.html.haml b/app/views/administrateurs/procedures/champs.html.haml index d927556a1..95ddf2860 100644 --- a/app/views/administrateurs/procedures/champs.html.haml +++ b/app/views/administrateurs/procedures/champs.html.haml @@ -1,10 +1,10 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Configuration des champs']], preview: @procedure.draft_revision.valid? } + ['Champs du formulaire']], preview: @procedure.draft_revision.valid? } .fr-container - %h1 Configuration des champs + %h1.fr-h2 Champs du formulaire = render NestedForms::FormOwnerComponent.new .fr-grid-row = render partial: 'champs_summary' @@ -15,12 +15,13 @@ .fixed-footer .fr-container .flex - %ul.fr-btns-group.fr-btns-group--inline-md + %ul.fr-btns-group.fr-btns-group--inline-md.fr-ml-0 %li - = link_to t('continue', scope: [:layouts, :breadcrumb]), admin_procedure_path(@procedure), title: t('continue_title', scope: [:layouts, :breadcrumb]), class: 'fr-btn' + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w fr-mr-2w' do + Revenir à l'écran de gestion - if @procedure.draft_revision.revision_types_de_champ_public.count > 0 %li - = link_to t('preview', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'fr-btn fr-btn--secondary' + = link_to t('preview', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'fr-link fr-mb-2w' .fr-ml-auto #autosave-notice.hidden = render TypesDeChampEditor::EstimatedFillDurationComponent.new(revision: @procedure.draft_revision, is_annotation: false) From 1fe59c165f51d74e23e88f125056f35cc19f876f Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 16:12:48 +0200 Subject: [PATCH 03/18] page service --- .../administrateurs/services/_form.html.haml | 4 +- .../administrateurs/services/edit.html.haml | 17 ++--- .../administrateurs/services/index.html.haml | 63 ++++++++++--------- 3 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/views/administrateurs/services/_form.html.haml b/app/views/administrateurs/services/_form.html.haml index c3afc1522..ec4a7233a 100644 --- a/app/views/administrateurs/services/_form.html.haml +++ b/app/views/administrateurs/services/_form.html.haml @@ -39,6 +39,6 @@ .fr-container %ul.fr-btns-group.fr-btns-group--inline-md %li - = f.submit "Enregistrer", class: "fr-btn" + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure.id), class: "fr-btn fr-btn--secondary" %li - = link_to "Annuler et revenir à la page de suivi", admin_procedure_path(id: @procedure.id), class: "fr-btn fr-btn--secondary" + = f.submit "Enregistrer", class: "fr-btn" diff --git a/app/views/administrateurs/services/edit.html.haml b/app/views/administrateurs/services/edit.html.haml index 186294bfc..0b056372c 100644 --- a/app/views/administrateurs/services/edit.html.haml +++ b/app/views/administrateurs/services/edit.html.haml @@ -5,21 +5,22 @@ ['Modifier le service']] } -.container +.fr-container + .flex.justify-between.align-center.fr-mb-3w + = link_to "Liste de tous les services", admin_services_path(procedure_id: @procedure.id), class: "fr-link fr-icon-arrow-left-line fr-link--icon-left" + = link_to "+ Nouveau service", new_admin_service_path(procedure_id: @procedure.id), class: "fr-btn" + + %h1.fr-h2 + Modifier le service + - other_services = @service.procedures.reject {|procedure| procedure.id == @procedure.id } - if other_services.count > 1 - = render Dsfr::AlertComponent.new(state: :warning, title: "Modifier ce service impactera la ou les démarches qui sont rattachée/s") do |c| + = render Dsfr::AlertComponent.new(state: :warning, title: "Modifier ce service impactera la ou les démarches qui sont rattachée/s", extra_class_names: 'fr-mb-3w') do |c| - c.with_body do %ul - other_services.each do |proc| %li= "#{proc.libelle} (N° #{proc.id})" %p.mt-3 Si vous souhaitez modifier uniquement les informations pour ce service, créez un nouveau service puis associez-le à la démarche - %p.mt-3 - = link_to "+ Nouveau service", new_admin_service_path(procedure_id: @procedure.id), class: "fr-btn" - - - %h1.mt-2 Modifier le service - = render partial: 'form', locals: { service: @service, procedure_id: @procedure.id } diff --git a/app/views/administrateurs/services/index.html.haml b/app/views/administrateurs/services/index.html.haml index b0fb75517..a837c14f6 100644 --- a/app/views/administrateurs/services/index.html.haml +++ b/app/views/administrateurs/services/index.html.haml @@ -1,34 +1,41 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_path], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Choix du service']] } + ['Service']] } -#services-index.container - %h1.fr-h1 Liste des Services - %h2.fr-h4 La démarche “#{@procedure.libelle}” peut être affectée aux services dans la liste ci-dessous +#services-index.fr-container + %h1.fr-h2 Service - %table.fr-table.width-100.mt-3 - %thead - %tr - %th{ scope: "col" } - Nom - %th.change{ scope: "col" } - = link_to "Nouveau service", new_admin_service_path(procedure_id: @procedure.id), class: "fr-btn fr-btn--secondary" - - %tbody - - @services.each do |service| + .fr-table.fr-table--layout-fixed + %table + %caption Liste des services pouvant être affectés à la démarche + %thead %tr - %td - = service.nom - %td.change - - if @procedure.service == service - %strong.mr-2 (Assigné) - - else - = button_to "Assigner", add_to_procedure_admin_services_path(procedure: { id: @procedure.id, service_id: service.id, }), method: :patch, class: 'link mr-2', form_class: 'inline' - = link_to('Modifier', edit_admin_service_path(service, procedure_id: @procedure.id), class: 'link my-2') - - if @procedure.service != service - = link_to 'Supprimer', - admin_service_path(service, procedure_id: @procedure.id), - method: :delete, - data: { confirm: "Confirmez vous la suppression de #{service.nom}" }, - class: 'btn btn-link ml-2' + %th{ scope: "col" } + Nom + %th.change{ scope: "col" } + = link_to "Nouveau service", new_admin_service_path(procedure_id: @procedure.id), class: "fr-btn fr-btn--secondary" + + %tbody + - @services.each do |service| + %tr + %td + = service.nom + %td.change + - if @procedure.service == service + %strong.mr-2 (Assigné) + - else + = button_to "Assigner", add_to_procedure_admin_services_path(procedure: { id: @procedure.id, service_id: service.id, }), method: :patch, class: 'link mr-2', form_class: 'inline' + = link_to('Modifier', edit_admin_service_path(service, procedure_id: @procedure.id), class: 'link my-2') + - if @procedure.service != service + = link_to 'Supprimer', + admin_service_path(service, procedure_id: @procedure.id), + method: :delete, + data: { confirm: "Confirmez vous la suppression de #{service.nom}" }, + class: 'btn btn-link ml-2' + +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion From 18585ce4222f3ba89855f9d9f2f45b2939554046 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 16:16:45 +0200 Subject: [PATCH 04/18] page administrateurs --- .../procedure_administrateurs/index.html.haml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/views/administrateurs/procedure_administrateurs/index.html.haml b/app/views/administrateurs/procedure_administrateurs/index.html.haml index 8ad25f4e1..0545d0f43 100644 --- a/app/views/administrateurs/procedure_administrateurs/index.html.haml +++ b/app/views/administrateurs/procedure_administrateurs/index.html.haml @@ -4,10 +4,14 @@ ['Administrateurs']], preview: false } .fr-container - %h1 Gérer les administrateurs de « #{@procedure.libelle} » + %h1.fr-h2 Administrateurs - .fr-table.fr-table--bordered + .fr-mb-4w + = render 'add_admin_form', procedure: @procedure, disabled_as_super_admin: administrateur_as_manager? + + .fr-table.fr-table--bordered.fr-table--layout-fixed %table + %caption Liste des administrateurs %thead %th= 'Adresse email' %th= 'Enregistré le' @@ -16,5 +20,8 @@ %tbody#administrateurs = render(Procedure::ProcedureAdministrateurs::AdministrateurComponent.with_collection(@procedure.administrateurs.order('users.email'), procedure: @procedure)) - .fr-mt-4w - = render 'add_admin_form', procedure: @procedure, disabled_as_super_admin: administrateur_as_manager? +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion From 659e4ffb617c40c919e7551f704afe1937837d06 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 16:24:17 +0200 Subject: [PATCH 05/18] page instructeurs --- .../instructeurs_management_component.html.haml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml b/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml index b3d9c2100..5b22e5325 100644 --- a/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml +++ b/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml @@ -1,5 +1,5 @@ - content_for(:title, 'Instructeurs') -%h1 Gestion des instructeurs +%h1.fr-h2 Instructeurs = render partial: 'administrateurs/groupe_instructeurs/import_export', locals: { procedure: @procedure } @@ -10,3 +10,9 @@ instructeurs: @instructeurs, available_instructeur_emails: @available_instructeur_emails, disabled_as_super_admin: @disabled_as_super_admin } + +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion From 1cec1b91c1654792812cb6cba0658ffa365020ca Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 16:31:42 +0200 Subject: [PATCH 06/18] page modifications historique --- .../modifications_component.fr.yml | 4 ++-- .../modifications_component.html.haml | 2 +- .../procedures/modifications.html.haml | 14 ++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/components/procedure/card/modifications_component/modifications_component.fr.yml b/app/components/procedure/card/modifications_component/modifications_component.fr.yml index e46fc4f3c..676fc64cd 100644 --- a/app/components/procedure/card/modifications_component/modifications_component.fr.yml +++ b/app/components/procedure/card/modifications_component/modifications_component.fr.yml @@ -1,5 +1,5 @@ --- fr: title: - one: Modification - other: Modifications + one: Modification du formulaire + other: Modifications du formulaire diff --git a/app/components/procedure/card/modifications_component/modifications_component.html.haml b/app/components/procedure/card/modifications_component/modifications_component.html.haml index 7ee37782a..9dc203c17 100644 --- a/app/components/procedure/card/modifications_component/modifications_component.html.haml +++ b/app/components/procedure/card/modifications_component/modifications_component.html.haml @@ -8,5 +8,5 @@ %h3.fr-h6 = t('.title', count: @procedure.revisions_count) - %p.fr-tile-subtitle Historique des modifications du formulaire + %p.fr-tile-subtitle Historique des modifications apportées au formulaire %p.fr-btn.fr-btn--tertiary Voir diff --git a/app/views/administrateurs/procedures/modifications.html.haml b/app/views/administrateurs/procedures/modifications.html.haml index a3775ada7..6c890f8fe 100644 --- a/app/views/administrateurs/procedures/modifications.html.haml +++ b/app/views/administrateurs/procedures/modifications.html.haml @@ -1,12 +1,12 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Modifications']] } -.container - %h1.page-title + ['Historique des modifications du formulaire']] } +.fr-container + %h1.fr-h2 Historique des modifications du formulaire -.container +.fr-container - previous_revision = nil - @procedure.revisions.each do |revision| - if previous_revision.present? && !revision.draft? @@ -30,3 +30,9 @@ %p= t('.dossiers_en_instruction', count: dossiers_en_instruction_count) = render Procedure::RevisionChangesComponent.new changes:, previous_revision: - previous_revision = revision + +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion From 45fbbf774da0311754cfe40f0e8ef5cbee37e12e Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 23 May 2024 16:52:53 +0200 Subject: [PATCH 07/18] page zones --- .../procedures/zones.html.haml | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/views/administrateurs/procedures/zones.html.haml b/app/views/administrateurs/procedures/zones.html.haml index e8b6e91eb..a0f5989e0 100644 --- a/app/views/administrateurs/procedures/zones.html.haml +++ b/app/views/administrateurs/procedures/zones.html.haml @@ -4,12 +4,12 @@ locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], ['Description']] } -.container - = form_for @procedure, - url: url_for({ controller: 'administrateurs/procedures', action: :update, id: @procedure.id }), - html: { multipart: true } do |f| += form_for @procedure, + url: url_for({ controller: 'administrateurs/procedures', action: :update, id: @procedure.id }), + html: { multipart: true } do |f| - %h1.page-title Zones + .fr-container + %h1.fr-h2 Zones - if Rails.application.config.ds_zonage_enabled %fieldset.fr-fieldset{ aria: { labelledby: "zones-legend"} } @@ -25,7 +25,11 @@ = b.check_box = b.label class: "fr-label" - .procedure-form__actions.sticky--bottom - .actions-right - = link_to 'Annuler', admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--tertiary fr-mr-2w', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - = f.button 'Enregistrer', class: 'fr-btn fr-btn--primary' + .padded-fixed-footer + .fixed-footer + .fr-container + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + %li + = f.button 'Enregistrer', class: 'fr-btn' From 233d6ee823dfa9e1580363f1a7477c88ffba8c76 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 23 May 2024 17:06:20 +0200 Subject: [PATCH 08/18] page avis externes --- .../experts_procedures/index.html.haml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/administrateurs/experts_procedures/index.html.haml b/app/views/administrateurs/experts_procedures/index.html.haml index 886aa061f..55995ed69 100644 --- a/app/views/administrateurs/experts_procedures/index.html.haml +++ b/app/views/administrateurs/experts_procedures/index.html.haml @@ -1,13 +1,13 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_path], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Liste des experts']] } + ['Avis externes']] } -.container - %h1.page-title.mt-2= t('.titles.main', libelle: @procedure.libelle) - - .container.groupe-instructeur +.fr-container + %h1.fr-h2 + Avis externes + .groupe-instructeur .card .card-title= t('.titles.allow_invite_experts') %p= t('.descriptions.allow_invite_experts') @@ -107,3 +107,9 @@ .blank-tab %h2.empty-text Aucun expert invité pour le moment. %p.empty-text-details Les instructeurs de cette démarche n’ont pas encore fait appel aux experts. + +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion From 918b1312db0241eb2510d873cd54057552da55cb Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 23 May 2024 17:09:09 +0200 Subject: [PATCH 09/18] page confi emails --- app/views/administrateurs/mail_templates/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/administrateurs/mail_templates/index.html.haml b/app/views/administrateurs/mail_templates/index.html.haml index 2aa43246d..7a6640439 100644 --- a/app/views/administrateurs/mail_templates/index.html.haml +++ b/app/views/administrateurs/mail_templates/index.html.haml @@ -6,7 +6,7 @@ .fr-container .fr-grid-row.fr-grid-row--gutters .fr-col-12 - %h1 Configuration des emails + %h1.fr-h2 Configuration des emails - if @procedure.accuse_lecture? = render Dsfr::AlertComponent.new(state: :info, size: :sm) do |c| - c.with_body do From 125c4a45fc47e39748af2732e62609544a8a3659 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 23 May 2024 17:24:09 +0200 Subject: [PATCH 10/18] page annotations --- .../administrateurs/procedures/annotations.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/administrateurs/procedures/annotations.html.haml b/app/views/administrateurs/procedures/annotations.html.haml index 05d198cf6..a903ae638 100644 --- a/app/views/administrateurs/procedures/annotations.html.haml +++ b/app/views/administrateurs/procedures/annotations.html.haml @@ -1,10 +1,10 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Configuration des annotations privées']], preview: true } + ['Annotations privées']], preview: true } .fr-container - %h1 Configuration des annotations privées + %h1.fr-h2 Annotations privées = render NestedForms::FormOwnerComponent.new .fr-grid-row .fr-col @@ -13,9 +13,9 @@ .padded-fixed-footer .fixed-footer .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md + %ul.fr-btns-group.fr-btns-group--inline-md.fr-ml-0 %li - = link_to t('continue_annotations', scope: [:layouts, :breadcrumb]), admin_procedure_path(@procedure), title: t('continue_annotations', scope: [:layouts, :breadcrumb]), class: 'fr-btn' + = link_to "Revenir à l'écran de gestion", admin_procedure_path(@procedure), title: t('continue_annotations', scope: [:layouts, :breadcrumb]), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w fr-mr-2w' - if @procedure.draft_revision.revision_types_de_champ_private.count > 0 %li - = link_to t('preview_annotations', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure, params: {tab: 'annotations-privees'}), target: "_blank", rel: "noopener", class: 'fr-btn fr-btn--secondary' + = link_to t('preview_annotations', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure, params: {tab: 'annotations-privees'}), target: "_blank", rel: "noopener", class: 'fr-link fr-mb-2w' From 06c784eb039c0579c288a2ff7ee8d90288df66ae Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 11:13:21 +0200 Subject: [PATCH 11/18] page api token --- .../administrateurs/procedures_controller.rb | 4 ++-- .../procedures/jeton.html.haml | 22 ++++++++++++------- config/locales/fr.yml | 1 - 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb index 4dde5c6c2..99a1a946e 100644 --- a/app/controllers/administrateurs/procedures_controller.rb +++ b/app/controllers/administrateurs/procedures_controller.rb @@ -298,8 +298,8 @@ module Administrateurs APIEntreprise::PrivilegesAdapter.new(token).valid? && @procedure.save - redirect_to jeton_admin_procedure_path(procedure_id: params[:procedure_id]), - notice: 'Le jeton a bien été mis à jour' + flash.notice = 'Le jeton a bien été mis à jour' + redirect_to admin_procedure_path(id: @procedure.id) else flash.now.alert = "Mise à jour impossible : le jeton n’est pas valide" diff --git a/app/views/administrateurs/procedures/jeton.html.haml b/app/views/administrateurs/procedures/jeton.html.haml index 0062ac47b..31d076d23 100644 --- a/app/views/administrateurs/procedures/jeton.html.haml +++ b/app/views/administrateurs/procedures/jeton.html.haml @@ -1,15 +1,13 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Jeton']] } + ['Jeton Entreprise']] } -.container - %h1.page-title - Configurer le jeton API Entreprise +.fr-container + %h1.fr-h2 Jeton Entreprise -.container - %h1 - = form_with model: @procedure, url: url_for({ controller: 'administrateurs/procedures', action: :update_jeton }) do |f| += form_with model: @procedure, url: url_for({ controller: 'administrateurs/procedures', action: :update_jeton }) do |f| + .fr-container = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c| - c.with_body do %p @@ -23,4 +21,12 @@ .fr-input-group = f.label :api_entreprise_token, "Jeton", class: 'fr-label' = f.password_field :api_entreprise_token, value: @procedure.read_attribute(:api_entreprise_token), class: 'fr-input' - = f.button 'Enregistrer', class: 'fr-btn' + + .padded-fixed-footer + .fixed-footer + .fr-container + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + %li + = f.button 'Enregistrer', class: 'fr-btn' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7378f6ff7..619f5f4f4 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -893,7 +893,6 @@ fr: configure_api_particulier_token: "Configurer le jeton API particulier" jeton_particulier: show: - configure_token: "Configurer le jeton API Particulier" api_particulier_description_html: "%{app_name} utilise API Particulier qui permet d’accéder aux données familiales (CAF), aux données fiscales (DGFiP), au statut pôle-emploi et au statut étudiant d’un citoyen.
Renseignez ici le jeton API Particulier propre à votre démarche." token_description: "Il doit contenir au minimum 15 caractères." update: From 6f0cf19f0d6815f9c3266cbc911d36e8c4a3ef32 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 15:08:28 +0200 Subject: [PATCH 12/18] page SVA SVR --- .../sva_svr_form_component.en.yml | 2 +- .../sva_svr_form_component.fr.yml | 2 +- .../sva_svr_form_component.html.haml | 69 ++++++++++--------- .../administrateurs/sva_svr/edit.html.haml | 6 +- 4 files changed, 43 insertions(+), 36 deletions(-) diff --git a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.en.yml b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.en.yml index f168f6503..0e285fc49 100644 --- a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.en.yml +++ b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.en.yml @@ -11,7 +11,7 @@ en: When an instructor asks for a file to be corrected, the countdown of the delay is interrupted. The delay resumes when the applicant resubmits their file stating that they have made the requested corrections. If the file has been declared incomplete, the delay will be reset, regardless of the configuration below. - submit: Apply SVA/SVR configuration + submit: Save cancel: Cancel decision_buttons: disabled: "Disabled" diff --git a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.fr.yml b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.fr.yml index 9a0316585..afb32dea3 100644 --- a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.fr.yml +++ b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.fr.yml @@ -11,7 +11,7 @@ fr: Lorsqu’un instructeur demande de corriger un dossier, le décompte du délai est interrompu. Le délai reprend lorsque le demandeur redépose son dossier en déclarant avoir effectué les corrections demandées. Si le dossier avait été déclaré incomplet, le délai sera réinitialisé, quelle que soit la configuration ci-dessous. - submit: Appliquer la configuration SVA/SVR + submit: Enregistrer cancel: Annuler decision_buttons: disabled: "Désactivé" diff --git a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml index 121f939f8..1eac6cb13 100644 --- a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml +++ b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml @@ -1,40 +1,47 @@ = form_for [procedure, configuration], url: admin_procedure_sva_svr_path(procedure), method: :put do |f| - - if !procedure.feature_enabled?(:sva) - .fr-alert.fr-alert--info.fr-alert--sm.fr-my-8w - %p - Pour activer le paramétrage de cette fonctionnalité, contactez-nous sur - = link_to CONTACT_EMAIL, "mailto:#{CONTACT_EMAIL}", **helpers.external_link_attributes - en indiquant votre numéro de démarche (#{@procedure.id}) et le cadre d’application du SVA/SVR. + .fr-container + - if !procedure.feature_enabled?(:sva) + .fr-alert.fr-alert--info.fr-alert--sm.fr-mb-5w + %p + Pour activer le paramétrage de cette fonctionnalité, contactez-nous sur + = link_to CONTACT_EMAIL, "mailto:#{CONTACT_EMAIL}", **helpers.external_link_attributes + en indiquant votre numéro de démarche (#{@procedure.id}) et le cadre d’application du SVA/SVR. - - elsif procedure.publiee? && !procedure.sva_svr_enabled? - .fr-alert.fr-alert--info.fr-alert--sm.fr-mb-4w - %p= t('.notice_new_files_only') + - elsif procedure.publiee? && !procedure.sva_svr_enabled? + .fr-alert.fr-alert--info.fr-alert--sm.fr-mb-4w + %p= t('.notice_new_files_only') - - if procedure.publiee? && procedure.sva_svr_enabled? - .fr-alert.fr-alert--warning.fr-alert--sm.fr-mb-4w - %p= t('.notice_edit_denied') + - if procedure.publiee? && procedure.sva_svr_enabled? + .fr-alert.fr-alert--warning.fr-alert--sm.fr-mb-4w + %p= t('.notice_edit_denied') - %fieldset.fr-fieldset - %legend.fr-fieldset__legend= t(".rule") - = render Dsfr::RadioButtonListComponent.new(form: f, target: :decision, buttons: decision_buttons, error: configuration.errors[:decision].first) + %fieldset.fr-fieldset + %legend.fr-fieldset__legend= t(".rule") + = render Dsfr::RadioButtonListComponent.new(form: f, target: :decision, buttons: decision_buttons, error: configuration.errors[:decision].first) - %fieldset.fr-fieldset - %legend.fr-fieldset__legend= t(".delay") - .fr-fieldset__element.fr-fieldset__element--inline - .fr-input-group - = f.number_field :period, class: 'fr-input', disabled: form_disabled? - .fr-fieldset__element.fr-fieldset__element--inline - .fr-select-group - = f.select :unit, options_for_select(SVASVRConfiguration.unit_options.map { [t(_1, scope: ".unit_labels"), _1] }, selected: configuration.unit), {}, class: 'fr-select', disabled: form_disabled? + %fieldset.fr-fieldset + %legend.fr-fieldset__legend= t(".delay") + .fr-fieldset__element.fr-fieldset__element--inline + .fr-input-group + = f.number_field :period, class: 'fr-input', disabled: form_disabled? + .fr-fieldset__element.fr-fieldset__element--inline + .fr-select-group + = f.select :unit, options_for_select(SVASVRConfiguration.unit_options.map { [t(_1, scope: ".unit_labels"), _1] }, selected: configuration.unit), {}, class: 'fr-select', disabled: form_disabled? - %fieldset.fr-fieldset - %legend.fr-fieldset__legend - = t(".resume_method") + %fieldset.fr-fieldset + %legend.fr-fieldset__legend + = t(".resume_method") - %span.fr-hint-text - = t(".resume_intro") + %span.fr-hint-text + = t(".resume_intro") - = render Dsfr::RadioButtonListComponent.new(form: f, target: :resume, buttons: resume_buttons) + = render Dsfr::RadioButtonListComponent.new(form: f, target: :resume, buttons: resume_buttons) - = f.submit t(".submit"), class: "fr-btn", disabled: form_disabled? - = link_to t(".cancel"), admin_procedure_path(procedure.id), class: "fr-btn fr-btn--secondary fr-ml-2w" + .padded-fixed-footer + .fixed-footer + .fr-container + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + %li + = f.submit t(".submit"), class: "fr-btn", disabled: form_disabled? diff --git a/app/views/administrateurs/sva_svr/edit.html.haml b/app/views/administrateurs/sva_svr/edit.html.haml index 715938671..2c026b42b 100644 --- a/app/views/administrateurs/sva_svr/edit.html.haml +++ b/app/views/administrateurs/sva_svr/edit.html.haml @@ -1,10 +1,10 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_path], ["#{@procedure.libelle.truncate_words(10)}", admin_procedure_path(@procedure)], - ["Configuration SVA/SVR"]] } + ["Silence Vaut Accord ou Rejet"]] } .fr-container.fr-my-5w - %h1.fr-h1 Règle du Silence Vaut Accord ou Silence Vaut Rejet + %h1.fr-h2 Silence Vaut Accord ou Rejet = render Dsfr::CalloutComponent.new(title: "Fonctionnement du SVA/SVR") do |c| - c.with_body do @@ -40,4 +40,4 @@ = link_to("Liste des démarches encadrées par ce principe", "https://www.service-public.fr/demarches-silence-vaut-accord", class: "fr-link", title: new_tab_suffix("Rechercher les démarches avec SVA sur service-public.fr"), **external_link_attributes) - = render Procedure::SVASVRFormComponent.new(procedure: @procedure, configuration: @configuration) += render Procedure::SVASVRFormComponent.new(procedure: @procedure, configuration: @configuration) From ba8b05ed6a0a51ca13d1be178601f76bfc879867 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 15:32:31 +0200 Subject: [PATCH 13/18] page MonAvis --- .../mon_avis_component.fr.yml | 2 +- .../administrateurs/procedures_controller.rb | 3 ++- .../procedures/_monavis.html.haml | 2 +- .../procedures/monavis.html.haml | 21 ++++++++++++------- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/components/procedure/card/mon_avis_component/mon_avis_component.fr.yml b/app/components/procedure/card/mon_avis_component/mon_avis_component.fr.yml index bdf8cabad..ca2c03824 100644 --- a/app/components/procedure/card/mon_avis_component/mon_avis_component.fr.yml +++ b/app/components/procedure/card/mon_avis_component/mon_avis_component.fr.yml @@ -1,3 +1,3 @@ --- fr: - title: MonAvis + title: Bouton « MonAvis » diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb index 99a1a946e..1c68058ea 100644 --- a/app/controllers/administrateurs/procedures_controller.rb +++ b/app/controllers/administrateurs/procedures_controller.rb @@ -270,10 +270,11 @@ module Administrateurs def update_monavis if !@procedure.update(procedure_params) flash.now.alert = @procedure.errors.full_messages + render 'monavis' else flash.notice = 'le champ MonAvis a bien été mis à jour' + redirect_to admin_procedure_path(id: @procedure.id) end - render 'monavis' end def accuse_lecture diff --git a/app/views/administrateurs/procedures/_monavis.html.haml b/app/views/administrateurs/procedures/_monavis.html.haml index 499f22d0e..62ac9d711 100644 --- a/app/views/administrateurs/procedures/_monavis.html.haml +++ b/app/views/administrateurs/procedures/_monavis.html.haml @@ -14,5 +14,5 @@ Une fois en possession du code généré sur le site MonAvis, vous pouvez le coller dans le champ ci-dessous : .fr-input-group - = f.label :monavis_embed, "Mon avis", class: "fr-label" + = f.label :monavis_embed, "Code généré sur le site MonAvis", class: "fr-label" = f.text_area :monavis_embed, rows: '6', placeholder: 'Je donne mon avis', class: 'fr-input' diff --git a/app/views/administrateurs/procedures/monavis.html.haml b/app/views/administrateurs/procedures/monavis.html.haml index 2cbc3cce3..1b8189d6b 100644 --- a/app/views/administrateurs/procedures/monavis.html.haml +++ b/app/views/administrateurs/procedures/monavis.html.haml @@ -3,12 +3,19 @@ [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], ['MonAvis']] } -.container - %h1.page-title - Insérer un lien vers « MonAvis » +.fr-container + %h1.fr-h2 + Bouton « MonAvis » -.container - %h1 - = form_for @procedure, url: url_for({ controller: 'administrateurs/procedures', action: :update_monavis }), html: { class: 'form', multipart: true } do |f| += form_for @procedure, url: url_for({ controller: 'administrateurs/procedures', action: :update_monavis }), html: { class: 'form', multipart: true } do |f| + .fr-container = render partial: 'monavis', locals: { f: f } - = f.button 'Enregistrer', class: 'fr-btn' + + .padded-fixed-footer + .fixed-footer + .fr-container + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + %li + = f.button 'Enregistrer', class: 'fr-btn' From 0df4b480fbe8078a0d205d6c1db143d59de2fc85 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 15:53:43 +0200 Subject: [PATCH 14/18] page fin de depot --- .../dossier_submitted_messages/edit.html.haml | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/app/views/administrateurs/dossier_submitted_messages/edit.html.haml b/app/views/administrateurs/dossier_submitted_messages/edit.html.haml index 08ce1b7cd..ed794cd73 100644 --- a/app/views/administrateurs/dossier_submitted_messages/edit.html.haml +++ b/app/views/administrateurs/dossier_submitted_messages/edit.html.haml @@ -3,31 +3,38 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_path], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Fin de dépot']] } + ['Fin de dépôt']] } -.procedure-form - .procedure-form__columns.container - = form_for @dossier_submitted_message, - url: url_for({ controller: 'administrateurs/dossier_submitted_messages', action: :update, id: @procedure.id }), - html: { class: 'form procedure-form__column--form fr-background-alt--blue-france' } do |f| += form_for @dossier_submitted_message, + url: url_for({ controller: 'administrateurs/dossier_submitted_messages', action: :update, id: @procedure.id }), + html: { class: 'form' } do |f| - %h1.page-title - Fin du dépot - %p.notice - L'utilisateur se verra afficher ce message une fois le dossier envoyé + .procedure-form + .procedure-form__columns.container + .procedure-form__column--form.fr-background-alt--blue-france.fr-pt-5w + %h1.fr-h2 + Fin de dépôt + %p.notice + L'utilisateur se verra afficher ce message une fois le dossier envoyé - = render partial: 'administrateurs/dossier_submitted_messages/informations', locals: { f: f } + = render partial: 'administrateurs/dossier_submitted_messages/informations', locals: { f: f } - .procedure-form__actions - .actions-left - = f.submit 'Enregistrer', class: 'fr-btn send' - .procedure-form__column--preview - %h3 - .procedure-form__preview-title - Aperçu - .notice - Cet aperçu est mis à jour après chaque sauvegarde. + .procedure-form__column--preview + %h3 + .procedure-form__preview-title + Aperçu + .notice + Cet aperçu est mis à jour après chaque sauvegarde. - .procedure-preview - = render partial: 'users/dossiers/merci', locals: { procedure: @procedure, dossier: nil} + .procedure-preview + = render partial: 'users/dossiers/merci', locals: { procedure: @procedure, dossier: nil} + + .padded-fixed-footer + .fixed-footer + .fr-container + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} + %li + = f.button 'Enregistrer', class: 'fr-btn' From 123a038c19ebf157033d6867b70ab6adaa80689f Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 16:03:06 +0200 Subject: [PATCH 15/18] page accuse lecture --- .../administrateurs/procedures/accuse_lecture.html.haml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/administrateurs/procedures/accuse_lecture.html.haml b/app/views/administrateurs/procedures/accuse_lecture.html.haml index 42465f148..65b1e5143 100644 --- a/app/views/administrateurs/procedures/accuse_lecture.html.haml +++ b/app/views/administrateurs/procedures/accuse_lecture.html.haml @@ -6,7 +6,7 @@ .fr-container .fr-grid-row .fr-col-12.fr-col-offset-md-2.fr-col-md-8 - %h1.page-title + %h1.fr-h2 Accusé de lecture = render Dsfr::CalloutComponent.new(title: nil) do |c| @@ -37,7 +37,6 @@ .fixed-footer .fr-container .fr-grid-row - .fr-col-12.fr-col-offset-md-2.fr-col-md-8 - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to 'Enregistrer et revenir à la page de suivi', admin_procedure_path(id: @procedure), class: 'fr-btn' + .fr-col-12.fr-col-offset-md-2.fr-col-md-8.fr-pb-2w + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w' do + Revenir à l'écran de gestion From 2659d0f966a25d06404891ba9f5e2ce86a22c16a Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 27 May 2024 17:56:05 +0200 Subject: [PATCH 16/18] create component for footer --- .../procedure/fixed_footer_component.rb | 10 ++++++++++ .../fixed_footer_component.html.fr.yml | 4 ++++ .../fixed_footer_component.html.haml | 20 +++++++++++++++++++ ...nstructeurs_management_component.html.haml | 7 ++----- .../sva_svr_form_component.html.haml | 9 +-------- .../dossier_submitted_messages/edit.html.haml | 9 +-------- .../experts_procedures/index.html.haml | 6 +----- .../mail_templates/index.html.haml | 8 +------- .../procedure_administrateurs/index.html.haml | 6 +----- .../procedures/accuse_lecture.html.haml | 8 +------- .../administrateurs/procedures/edit.html.haml | 11 +--------- .../procedures/jeton.html.haml | 9 +-------- .../procedures/modifications.html.haml | 6 +----- .../procedures/monavis.html.haml | 9 +-------- .../procedures/zones.html.haml | 9 +-------- .../administrateurs/services/_form.html.haml | 9 +-------- .../administrateurs/services/index.html.haml | 6 +----- 17 files changed, 49 insertions(+), 97 deletions(-) create mode 100644 app/components/procedure/fixed_footer_component.rb create mode 100644 app/components/procedure/fixed_footer_component/fixed_footer_component.html.fr.yml create mode 100644 app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml diff --git a/app/components/procedure/fixed_footer_component.rb b/app/components/procedure/fixed_footer_component.rb new file mode 100644 index 000000000..b67548bca --- /dev/null +++ b/app/components/procedure/fixed_footer_component.rb @@ -0,0 +1,10 @@ +class Procedure::FixedFooterComponent < ApplicationComponent + def initialize(procedure:, form: nil, is_form_disabled: nil, extra_class_names: nil) + @procedure = procedure + @form = form + @is_form_disabled = is_form_disabled + @extra_class_names = extra_class_names + end + + attr_reader :form, :is_form_disabled, :extra_class_names +end diff --git a/app/components/procedure/fixed_footer_component/fixed_footer_component.html.fr.yml b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.fr.yml new file mode 100644 index 000000000..0c67a97f1 --- /dev/null +++ b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.fr.yml @@ -0,0 +1,4 @@ +fr: + back: Revenir à l'écran de gestion + submit: Enregistrer + cancel: Annuler et revenir à l'écran de gestion diff --git a/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml new file mode 100644 index 000000000..2116e38ff --- /dev/null +++ b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml @@ -0,0 +1,20 @@ +- if form + .padded-fixed-footer + .fixed-footer + .fr-container + .fr-grid-row + %div{ class: "fr-col-12 #{extra_class_names}" } + %ul.fr-btns-group.fr-btns-group--inline-md + %li + = link_to t('.cancel'), admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Si vous avez fait des modifications elles ne seront pas sauvegardées.'} + %li + = form.submit t(".submit"), class: "fr-btn", disabled: is_form_disabled + +- else + .padded-fixed-footer + .fixed-footer + .fr-container + .fr-grid-row + %div{ class: "fr-col-12 fr-pb-2w #{extra_class_names}" } + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w' do + = t('.back') diff --git a/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml b/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml index 5b22e5325..3b538bdb1 100644 --- a/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml +++ b/app/components/procedure/instructeurs_management_component/instructeurs_management_component.html.haml @@ -11,8 +11,5 @@ available_instructeur_emails: @available_instructeur_emails, disabled_as_super_admin: @disabled_as_super_admin } -.padded-fixed-footer - .fixed-footer.fr-pb-2w - .fr-container - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do - Revenir à l'écran de gestion + += render Procedure::FixedFooterComponent.new(procedure: @procedure) diff --git a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml index 1eac6cb13..85719eb9a 100644 --- a/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml +++ b/app/components/procedure/sva_svr_form_component/sva_svr_form_component.html.haml @@ -37,11 +37,4 @@ = render Dsfr::RadioButtonListComponent.new(form: f, target: :resume, buttons: resume_buttons) - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.submit t(".submit"), class: "fr-btn", disabled: form_disabled? + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f, is_form_disabled: form_disabled?) diff --git a/app/views/administrateurs/dossier_submitted_messages/edit.html.haml b/app/views/administrateurs/dossier_submitted_messages/edit.html.haml index ed794cd73..dc289c291 100644 --- a/app/views/administrateurs/dossier_submitted_messages/edit.html.haml +++ b/app/views/administrateurs/dossier_submitted_messages/edit.html.haml @@ -30,11 +30,4 @@ .procedure-preview = render partial: 'users/dossiers/merci', locals: { procedure: @procedure, dossier: nil} - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.button 'Enregistrer', class: 'fr-btn' + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f) diff --git a/app/views/administrateurs/experts_procedures/index.html.haml b/app/views/administrateurs/experts_procedures/index.html.haml index 55995ed69..e1d6b6d88 100644 --- a/app/views/administrateurs/experts_procedures/index.html.haml +++ b/app/views/administrateurs/experts_procedures/index.html.haml @@ -108,8 +108,4 @@ %h2.empty-text Aucun expert invité pour le moment. %p.empty-text-details Les instructeurs de cette démarche n’ont pas encore fait appel aux experts. -.padded-fixed-footer - .fixed-footer.fr-pb-2w - .fr-container - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do - Revenir à l'écran de gestion += render Procedure::FixedFooterComponent.new(procedure: @procedure) diff --git a/app/views/administrateurs/mail_templates/index.html.haml b/app/views/administrateurs/mail_templates/index.html.haml index 7a6640439..9fd744726 100644 --- a/app/views/administrateurs/mail_templates/index.html.haml +++ b/app/views/administrateurs/mail_templates/index.html.haml @@ -18,10 +18,4 @@ = render Procedure::EmailTemplateCardComponent.new(email_template: mail_template) -.padded-fixed-footer - .fixed-footer - .fr-container - .fr-grid-row - .fr-col-12.fr-pb-2w - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w' do - Revenir à la démarche += render Procedure::FixedFooterComponent.new(procedure: @procedure) diff --git a/app/views/administrateurs/procedure_administrateurs/index.html.haml b/app/views/administrateurs/procedure_administrateurs/index.html.haml index 0545d0f43..3e9bf37aa 100644 --- a/app/views/administrateurs/procedure_administrateurs/index.html.haml +++ b/app/views/administrateurs/procedure_administrateurs/index.html.haml @@ -20,8 +20,4 @@ %tbody#administrateurs = render(Procedure::ProcedureAdministrateurs::AdministrateurComponent.with_collection(@procedure.administrateurs.order('users.email'), procedure: @procedure)) -.padded-fixed-footer - .fixed-footer.fr-pb-2w - .fr-container - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do - Revenir à l'écran de gestion += render Procedure::FixedFooterComponent.new(procedure: @procedure) diff --git a/app/views/administrateurs/procedures/accuse_lecture.html.haml b/app/views/administrateurs/procedures/accuse_lecture.html.haml index 65b1e5143..90be126cc 100644 --- a/app/views/administrateurs/procedures/accuse_lecture.html.haml +++ b/app/views/administrateurs/procedures/accuse_lecture.html.haml @@ -33,10 +33,4 @@ hint: "L’accusé de lecture est à activer uniquement pour les démarches avec voies de recours car il complexifie l’accès à la décision finale pour les usagers", opt: {"checked" => @procedure.accuse_lecture}) -.padded-fixed-footer - .fixed-footer - .fr-container - .fr-grid-row - .fr-col-12.fr-col-offset-md-2.fr-col-md-8.fr-pb-2w - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left fr-mb-2w' do - Revenir à l'écran de gestion += render Procedure::FixedFooterComponent.new(procedure: @procedure, extra_class_names: 'fr-col-offset-md-2 fr-col-md-8' ) diff --git a/app/views/administrateurs/procedures/edit.html.haml b/app/views/administrateurs/procedures/edit.html.haml index f79244721..95164e8e6 100644 --- a/app/views/administrateurs/procedures/edit.html.haml +++ b/app/views/administrateurs/procedures/edit.html.haml @@ -16,13 +16,4 @@ = render partial: 'administrateurs/procedures/informations', locals: { f: f } - .padded-fixed-footer - .fixed-footer - .fr-container - .fr-grid-row - .fr-col-12.fr-col-offset-md-2.fr-col-md-8 - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.button 'Enregistrer', class: 'fr-btn' + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f, extra_class_names: 'fr-col-offset-md-2 fr-col-md-8') diff --git a/app/views/administrateurs/procedures/jeton.html.haml b/app/views/administrateurs/procedures/jeton.html.haml index 31d076d23..35d92ab90 100644 --- a/app/views/administrateurs/procedures/jeton.html.haml +++ b/app/views/administrateurs/procedures/jeton.html.haml @@ -22,11 +22,4 @@ = f.label :api_entreprise_token, "Jeton", class: 'fr-label' = f.password_field :api_entreprise_token, value: @procedure.read_attribute(:api_entreprise_token), class: 'fr-input' - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.button 'Enregistrer', class: 'fr-btn' + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f) diff --git a/app/views/administrateurs/procedures/modifications.html.haml b/app/views/administrateurs/procedures/modifications.html.haml index 6c890f8fe..ea9e9c32b 100644 --- a/app/views/administrateurs/procedures/modifications.html.haml +++ b/app/views/administrateurs/procedures/modifications.html.haml @@ -31,8 +31,4 @@ = render Procedure::RevisionChangesComponent.new changes:, previous_revision: - previous_revision = revision -.padded-fixed-footer - .fixed-footer.fr-pb-2w - .fr-container - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do - Revenir à l'écran de gestion += render Procedure::FixedFooterComponent.new(procedure: @procedure) diff --git a/app/views/administrateurs/procedures/monavis.html.haml b/app/views/administrateurs/procedures/monavis.html.haml index 1b8189d6b..ee5e98fe9 100644 --- a/app/views/administrateurs/procedures/monavis.html.haml +++ b/app/views/administrateurs/procedures/monavis.html.haml @@ -11,11 +11,4 @@ .fr-container = render partial: 'monavis', locals: { f: f } - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.button 'Enregistrer', class: 'fr-btn' + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f) diff --git a/app/views/administrateurs/procedures/zones.html.haml b/app/views/administrateurs/procedures/zones.html.haml index a0f5989e0..f30e5c737 100644 --- a/app/views/administrateurs/procedures/zones.html.haml +++ b/app/views/administrateurs/procedures/zones.html.haml @@ -25,11 +25,4 @@ = b.check_box = b.label class: "fr-label" - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} - %li - = f.button 'Enregistrer', class: 'fr-btn' + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f) diff --git a/app/views/administrateurs/services/_form.html.haml b/app/views/administrateurs/services/_form.html.haml index ec4a7233a..9c6040508 100644 --- a/app/views/administrateurs/services/_form.html.haml +++ b/app/views/administrateurs/services/_form.html.haml @@ -34,11 +34,4 @@ - if procedure_id.present? = hidden_field_tag :procedure_id, procedure_id - .padded-fixed-footer - .fixed-footer - .fr-container - %ul.fr-btns-group.fr-btns-group--inline-md - %li - = link_to "Annuler et revenir à l'écran de gestion", admin_procedure_path(id: @procedure.id), class: "fr-btn fr-btn--secondary" - %li - = f.submit "Enregistrer", class: "fr-btn" + = render Procedure::FixedFooterComponent.new(procedure: @procedure, form: f) diff --git a/app/views/administrateurs/services/index.html.haml b/app/views/administrateurs/services/index.html.haml index a837c14f6..123e76536 100644 --- a/app/views/administrateurs/services/index.html.haml +++ b/app/views/administrateurs/services/index.html.haml @@ -34,8 +34,4 @@ data: { confirm: "Confirmez vous la suppression de #{service.nom}" }, class: 'btn btn-link ml-2' -.padded-fixed-footer - .fixed-footer.fr-pb-2w - .fr-container - = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do - Revenir à l'écran de gestion += render Procedure::FixedFooterComponent.new(procedure: @procedure) From 291271f04b718cfcd01a4265ad1d4809972af1d0 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Tue, 28 May 2024 10:58:03 +0200 Subject: [PATCH 17/18] fix linter and specs --- .../administrateurs/jeton_particulier/show.html.haml | 11 +++++------ config/locales/views/layouts/_breadcrumb.en.yml | 2 -- config/locales/views/layouts/_breadcrumb.fr.yml | 2 -- .../administrateurs/procedures_controller_spec.rb | 2 +- .../administrateurs/procedure_administrateurs_spec.rb | 2 +- .../procedure_groupe_instructeur_spec.rb | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/views/administrateurs/jeton_particulier/show.html.haml b/app/views/administrateurs/jeton_particulier/show.html.haml index 7527313eb..f0ded6bdb 100644 --- a/app/views/administrateurs/jeton_particulier/show.html.haml +++ b/app/views/administrateurs/jeton_particulier/show.html.haml @@ -2,14 +2,13 @@ locals: { steps: [['Démarches', admin_procedures_path], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], [Procedure.human_attribute_name(:jeton_api_particulier), admin_procedure_api_particulier_path(@procedure)], - ['Jeton']] } + ['Jeton Particulier']] } -.container - %h1.page-title - = t('.configure_token') +.fr-container + %h1.fr-h2 + Jeton Particulier -.container - %h1 +.fr-container = form_with model: @procedure, url: admin_procedure_api_particulier_jeton_path, local: true do |f| = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c| - c.with_body do diff --git a/config/locales/views/layouts/_breadcrumb.en.yml b/config/locales/views/layouts/_breadcrumb.en.yml index 8efbc086e..f0a4ff07d 100644 --- a/config/locales/views/layouts/_breadcrumb.en.yml +++ b/config/locales/views/layouts/_breadcrumb.en.yml @@ -6,9 +6,7 @@ en: show: Show breadcrumb preview: "Preview the form" preview_annotations: "Preview annotations" - continue: "Validate form" continue_annotations: "Validate annotations" - continue_title: "You can comeback using this link" since: "since %{date}" closed: "Closed" published: "Published" diff --git a/config/locales/views/layouts/_breadcrumb.fr.yml b/config/locales/views/layouts/_breadcrumb.fr.yml index 14f4fa15f..9605fb9ef 100644 --- a/config/locales/views/layouts/_breadcrumb.fr.yml +++ b/config/locales/views/layouts/_breadcrumb.fr.yml @@ -6,9 +6,7 @@ fr: show: "Voir le fil d’Ariane" preview: "Prévisualiser le formulaire" preview_annotations: "Prévisualiser les annotations" - continue: "Valider le formulaire" continue_annotations: "Valider les annotations" - continue_title: "Vous pourrez revenir ici par la suite" since: "depuis le %{date}" closed: "Close" published: "Publiée" diff --git a/spec/controllers/administrateurs/procedures_controller_spec.rb b/spec/controllers/administrateurs/procedures_controller_spec.rb index 1193b769f..e19155b82 100644 --- a/spec/controllers/administrateurs/procedures_controller_spec.rb +++ b/spec/controllers/administrateurs/procedures_controller_spec.rb @@ -977,7 +977,7 @@ describe Administrateurs::ProceduresController, type: :controller do end it { expect(flash[:notice]).to be_present } - it { expect(response.body).to include "MonAvis" } + it { expect(response).to redirect_to(admin_procedure_path(procedure.id)) } end context 'when the embed code is not valid' do diff --git a/spec/system/administrateurs/procedure_administrateurs_spec.rb b/spec/system/administrateurs/procedure_administrateurs_spec.rb index 8d6d3bea6..420c439b3 100644 --- a/spec/system/administrateurs/procedure_administrateurs_spec.rb +++ b/spec/system/administrateurs/procedure_administrateurs_spec.rb @@ -14,7 +14,7 @@ describe 'Administrateurs can manage administrateurs', js: true do scenario 'card is clickable' do visit admin_procedure_path(procedure) find('#administrateurs').click - expect(page).to have_css("h1", text: "Gérer les administrateurs de « #{procedure.libelle} »") + expect(page).to have_css("h1", text: "Administrateurs") end context 'as admin not flagged from manager' do diff --git a/spec/system/administrateurs/procedure_groupe_instructeur_spec.rb b/spec/system/administrateurs/procedure_groupe_instructeur_spec.rb index c5ac2c33a..6dd065aae 100644 --- a/spec/system/administrateurs/procedure_groupe_instructeur_spec.rb +++ b/spec/system/administrateurs/procedure_groupe_instructeur_spec.rb @@ -17,7 +17,7 @@ describe 'Manage procedure instructeurs', js: true do scenario 'it works' do visit admin_procedure_path(procedure) find('#groupe-instructeurs').click - expect(page).to have_css("h1", text: "Gestion des instructeurs") + expect(page).to have_css("h1", text: "Instructeurs") end end From 4446d6d62abe8471af34a9c54e8fa516509b40fa Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 30 May 2024 16:33:25 +0200 Subject: [PATCH 18/18] remove footer for admin pages with sticky footer --- .../fixed_footer_component/fixed_footer_component.html.haml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml index 2116e38ff..c9ebaaa0f 100644 --- a/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml +++ b/app/components/procedure/fixed_footer_component/fixed_footer_component.html.haml @@ -1,3 +1,6 @@ +- content_for(:footer) do +   + - if form .padded-fixed-footer .fixed-footer