diff --git a/app/assets/stylesheets/card_admin.scss b/app/assets/stylesheets/card_admin.scss index 376ef9845..4d549df28 100644 --- a/app/assets/stylesheets/card_admin.scss +++ b/app/assets/stylesheets/card_admin.scss @@ -2,6 +2,7 @@ @import "constants"; .card-admin { + color: $black; padding-top: 10px; padding-bottom: 10px; width: 236px; @@ -35,6 +36,18 @@ .card-admin-action { margin-top: auto; } + + .button { + margin: auto auto 0 auto; + } + + &:hover { + color: $blue; + + .button { + color: $blue; + } + } } @media only screen and (max-width: 600px) { diff --git a/app/assets/stylesheets/dossiers_table.scss b/app/assets/stylesheets/dossiers_table.scss index f91a2f7c0..32fec296e 100644 --- a/app/assets/stylesheets/dossiers_table.scss +++ b/app/assets/stylesheets/dossiers_table.scss @@ -5,7 +5,7 @@ font-size: 14px; th { - vertical-align: middle; + vertical-align: top; padding: (2 * $default-spacer) $default-spacer; } diff --git a/app/helpers/procedure_helper.rb b/app/helpers/procedure_helper.rb index 155c28e21..24130e001 100644 --- a/app/helpers/procedure_helper.rb +++ b/app/helpers/procedure_helper.rb @@ -30,7 +30,8 @@ module ProcedureHelper typeDeChampsTypes: TypeDeChamp.type_de_champ_types_for(procedure, current_user), typeDeChamps: (procedure.draft_revision ? procedure.draft_revision : procedure).types_de_champ.as_json_for_editor, baseUrl: admin_procedure_types_de_champ_path(procedure), - directUploadUrl: rails_direct_uploads_url + directUploadUrl: rails_direct_uploads_url, + continuerUrl: admin_procedure_path(procedure) } end @@ -40,7 +41,8 @@ module ProcedureHelper typeDeChampsTypes: TypeDeChamp.type_de_champ_types_for(procedure, current_user), typeDeChamps: (procedure.draft_revision ? procedure.draft_revision : procedure).types_de_champ_private.as_json_for_editor, baseUrl: admin_procedure_types_de_champ_path(procedure), - directUploadUrl: rails_direct_uploads_url + directUploadUrl: rails_direct_uploads_url, + continuerUrl: admin_procedure_path(procedure) } end diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx index 3b7c172cc..ccd3305d5 100644 --- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx +++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx @@ -60,12 +60,9 @@ function TypeDeChamps({ state: rootState, typeDeChamps }) {    {addChampLabel(state.isAnnotation)} - + + Continuer > + ); diff --git a/app/javascript/components/TypesDeChampEditor/index.jsx b/app/javascript/components/TypesDeChampEditor/index.jsx index d2ec2d494..3b2347b96 100644 --- a/app/javascript/components/TypesDeChampEditor/index.jsx +++ b/app/javascript/components/TypesDeChampEditor/index.jsx @@ -22,7 +22,8 @@ class TypesDeChampEditor extends Component { defaultTypeDeChampAttributes, typeDeChampsTypes: props.typeDeChampsTypes, directUploadUrl: props.directUploadUrl, - isAnnotation: props.isAnnotation + isAnnotation: props.isAnnotation, + continuerUrl: props.continuerUrl }; } @@ -35,6 +36,7 @@ class TypesDeChampEditor extends Component { TypesDeChampEditor.propTypes = { baseUrl: PropTypes.string, + continuerUrl: PropTypes.string, directUploadUrl: PropTypes.string, isAnnotation: PropTypes.bool, typeDeChamps: PropTypes.array, diff --git a/app/views/new_administrateur/_breadcrumbs.html.haml b/app/views/new_administrateur/_breadcrumbs.html.haml index 93353f9ee..27b617763 100644 --- a/app/views/new_administrateur/_breadcrumbs.html.haml +++ b/app/views/new_administrateur/_breadcrumbs.html.haml @@ -4,8 +4,9 @@ - steps.each do |step| %li= step - if defined?(preview) && preview - = link_to "Prévisualiser le formulaire", apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'button' - = link_to "Continuer >", admin_procedure_path(@procedure), title: 'Vous pourrez revenir ici par la suite', class: 'button accepted' + .mb-2 + = link_to "Prévisualiser le formulaire", apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'button' + = link_to "Continuer >", admin_procedure_path(@procedure), title: 'Vous pourrez revenir ici par la suite', class: 'button accepted' - if defined?(metadatas) %ul.admin-metadata - metadatas.each do |metadata| diff --git a/app/views/new_administrateur/procedures/show.html.haml b/app/views/new_administrateur/procedures/show.html.haml index 169a9ca30..82d2983d0 100644 --- a/app/views/new_administrateur/procedures/show.html.haml +++ b/app/views/new_administrateur/procedures/show.html.haml @@ -32,18 +32,17 @@ .container %h2.procedure-admin-explanation Indispensable avant publication .procedure-grid - .card-admin + = link_to edit_admin_procedure_path(@procedure), id: 'presentation', class: 'card-admin' do %div %span.icon.accept %p.card-admin-status-accept Validé %div %p.card-admin-title Présentation %p.card-admin-subtitle Logo, nom, description - .card-admin-action - = link_to 'Modifier', edit_admin_procedure_path(@procedure), class: 'button', id: "presentation" + %p.button Modifier - if !@procedure.locked? - .card-admin + = link_to champs_admin_procedure_path(@procedure), class: 'card-admin' do - if @procedure.draft_types_de_champ.count > 0 %div %span.icon.accept @@ -57,10 +56,19 @@ %span.badge.baseline= @procedure.draft_types_de_champ.count Champs du formulaire %p.card-admin-subtitle À remplir par les usagers - .card-admin-action - = link_to 'Modifier', champs_admin_procedure_path(@procedure), class: 'button' + %p.button Modifier - .card-admin + - if @procedure.service.present? + - service_link = edit_admin_service_path(@procedure.service, procedure_id: @procedure.id) + - service_button_text = 'Modifier' + - elsif current_administrateur.services.present? + - service_link = admin_services_path(procedure_id: @procedure.id) + - service_button_text = 'Choisir' + - else + - service_link = new_admin_service_path(procedure_id: @procedure.id) + - service_button_text = 'Remplir' + + = link_to service_link, class: 'card-admin' do - if @procedure.service_id.present? %div %span.icon.accept @@ -76,15 +84,9 @@ = @procedure.service.nom - else Choix du service administratif - .card-admin-action - - if @procedure.service.present? - = link_to 'Modifier', edit_admin_service_path(@procedure.service, procedure_id: @procedure.id), class: 'button' - - elsif current_administrateur.services.present? - = link_to 'Choisir', admin_services_path(procedure_id: @procedure.id), class: 'button' - - else - = link_to 'Remplir', new_admin_service_path(procedure_id: @procedure.id), class: 'button' + %p.button= service_button_text - .card-admin + = link_to admin_procedure_administrateurs_path(@procedure), id: 'administrateurs', class: 'card-admin' do %div %span.icon.accept %p.card-admin-status-accept Validé @@ -92,17 +94,17 @@ %p.card-admin-title %span.badge.baseline= @procedure.administrateurs.count #{"Administrateur".pluralize(@procedure.administrateurs.count)} - %p.card-admin-subtitle Gestion de la démarche - .card-admin-action - = link_to 'Modifier', admin_procedure_administrateurs_path(@procedure), class: 'button', id: "administrateurs" + %p.button Modifier - .card-admin - - if feature_enabled?(:administrateur_routage) - %div - %span.icon.accept - %p.card-admin-status-accept Validé - - elsif @procedure.instructeurs.count > 1 + + - if feature_enabled?(:administrateur_routage) + - instructeur_link = admin_procedure_groupe_instructeurs_path(@procedure) + - else + - instructeur_link = admin_procedure_groupe_instructeur_path(@procedure, @procedure.defaut_groupe_instructeur) + + = link_to instructeur_link, id: 'groupe-instructeurs', class: 'card-admin' do + - if feature_enabled?(:administrateur_routage) || @procedure.instructeurs.count > 1 %div %span.icon.accept %p.card-admin-status-accept Validé @@ -119,15 +121,12 @@ = feature_enabled?(:administrateur_routage) ? "Groupe Instructeurs" : "#{"Instructeur".pluralize(@procedure.instructeurs.count)}" %p.card-admin-subtitle Suivi des dossiers - .card-admin-action - - if feature_enabled?(:administrateur_routage) - = link_to 'Modifier', admin_procedure_groupe_instructeurs_path(@procedure), class: 'button', id: "groupe-instructeurs" - - else - = link_to 'Modifier', admin_procedure_groupe_instructeur_path(@procedure, @procedure.defaut_groupe_instructeur), class: 'button', id: "instructeurs" + %p.button Modifier %h2.procedure-admin-explanation Pour aller plus loin .procedure-grid - .card-admin + + = link_to edit_admin_procedure_attestation_template_path(@procedure), class: 'card-admin' do - if @procedure.attestation_template.present? && @procedure.attestation_template.activated %div %span.icon.accept @@ -139,34 +138,29 @@ %div %p.card-admin-title Attestation %p.card-admin-subtitle Délivrance automatique pour les dossiers acceptés - .card-admin-action - = link_to 'Modifier', edit_admin_procedure_attestation_template_path(@procedure), class: 'button' + %p.button Modifier - .card-admin + = link_to admin_procedure_experts_path(@procedure), class: 'card-admin' do %div %span.icon.preview %p.card-admin-status-todo À configurer - %div %p.card-admin-title Avis externes %p.card-admin-subtitle Gérer les avis des experts invités - - .card-admin-action - = link_to "Modifier", admin_procedure_experts_path(@procedure), class: 'button' + %p.button Modifier - .card-admin + = link_to admin_procedure_mail_templates_path(@procedure), class: 'card-admin' do %div %span.icon.clock %p.card-admin-status-todo À configurer %div %p.card-admin-title Configuration des emails %p.card-admin-subtitle Notifications automatiques - .card-admin-action - = link_to 'Modifier', admin_procedure_mail_templates_path(@procedure), class: 'button' + %p.button Modifier - if !@procedure.locked? - .card-admin + = link_to annotations_admin_procedure_path(@procedure), class: 'card-admin' do - if @procedure.draft_types_de_champ_private.present? %div %span.icon.accept @@ -178,10 +172,9 @@ %div %p.card-admin-title Annotations privées %p.card-admin-subtitle Champs à remplir par l’administration - .card-admin-action - = link_to 'Modifier', annotations_admin_procedure_path(@procedure), class: 'button' + %p.button Modifier - .card-admin + = link_to jeton_admin_procedure_path(@procedure), class: 'card-admin' do - if @procedure.api_entreprise_token.present? %div %span.icon.accept @@ -193,10 +186,9 @@ %div %p.card-admin-title Jeton %p.card-admin-subtitle Configurer le jeton API entreprise - .card-admin-action - = link_to 'Modifier', jeton_admin_procedure_path(@procedure), class: 'button' + %p.button Modifier - .card-admin + = link_to monavis_admin_procedure_path(@procedure), class: 'card-admin' do - if @procedure.monavis_embed.present? %div %span.icon.accept @@ -208,5 +200,4 @@ %div %p.card-admin-title MonAvis %p.card-admin-subtitle Avis des usagers sur votre démarche - .card-admin-action - = link_to 'Modifier', monavis_admin_procedure_path(@procedure), class: 'button' + %p.button Modifier diff --git a/spec/features/new_administrateur/types_de_champ_spec.rb b/spec/features/new_administrateur/types_de_champ_spec.rb index 20d908f3f..30fe31433 100644 --- a/spec/features/new_administrateur/types_de_champ_spec.rb +++ b/spec/features/new_administrateur/types_de_champ_spec.rb @@ -13,12 +13,6 @@ feature 'As an administrateur I can edit types de champ', js: true do fill_in 'champ-0-libelle', with: 'libellé de champ' blur expect(page).to have_content('Formulaire enregistré') - - page.refresh - within '.buttons' do - click_on 'Enregistrer' - end - expect(page).to have_content('Formulaire enregistré') end it "Add multiple champs" do