From d78e913d181025ce736682b76c8a3b542270af01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Meneuvrier?= Date: Tue, 17 Sep 2024 17:05:35 +0200 Subject: [PATCH] order buttons #2991 --- .../desordres_profile_occupant.json | 708 ++++++++++------ .../Signalement/desordres_profile_tiers.json | 765 ++++++++++++------ .../questions_profile_bailleur.json | 627 +++++++++----- .../questions_profile_bailleur_occupant.json | 594 +++++++++----- .../questions_profile_locataire.json | 590 +++++++++----- .../questions_profile_service_secours.json | 520 +++++++----- .../questions_profile_tiers_particulier.json | 667 +++++++++------ .../questions_profile_tiers_pro.json | 664 +++++++++------ .../Signalement/questions_profile_tous.json | 93 ++- .../components/SignalementFormAddress.vue | 7 +- .../SignalementFormAutocomplete.vue | 11 +- .../components/SignalementFormButton.vue | 22 +- .../components/SignalementFormCheckbox.vue | 19 +- .../components/SignalementFormCounter.vue | 17 +- .../components/SignalementFormDate.vue | 19 +- .../SignalementFormDisorderCategoryItem.vue | 17 +- .../SignalementFormDisorderCategoryList.vue | 1 + .../SignalementFormDisorderOverview.vue | 54 +- .../components/SignalementFormLink.vue | 29 +- .../components/SignalementFormOnlyChoice.vue | 35 +- .../components/SignalementFormOverview.vue | 11 +- .../components/SignalementFormRoomList.vue | 5 +- .../components/SignalementFormScreen.vue | 3 + .../components/SignalementFormSubscreen.vue | 2 + .../components/SignalementFormTextfield.vue | 19 +- src/DataFixtures/Files/Suivi.yml | 2 +- 26 files changed, 3648 insertions(+), 1853 deletions(-) diff --git a/assets/json/Signalement/desordres_profile_occupant.json b/assets/json/Signalement/desordres_profile_occupant.json index ac06c96a5..1e4ada744 100644 --- a/assets/json/Signalement/desordres_profile_occupant.json +++ b/assets/json/Signalement/desordres_profile_occupant.json @@ -21,7 +21,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormSubscreen", @@ -32,18 +35,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_les_desordres_previous", - "action": "goto:travailleur_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_les_desordres_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_les_desordres_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_les_desordres_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_les_desordres_previous", + "action": "goto:travailleur_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -77,6 +89,9 @@ }, "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -189,7 +204,7 @@ "footer": [ { "type": "SignalementFormSubscreen", - "slug": "desordres_batiment_boutons", + "slug": "desordres_batiment_footer", "customCss": "button-group-full-size fr-mt-5v", "components": { "body": [ @@ -231,6 +246,9 @@ "label": "{{dictionaryStore::desordres_batiment_proprete_interieur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -268,18 +286,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_proprete_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_proprete_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_proprete_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_proprete_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_proprete_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -302,6 +329,9 @@ "label": "{{dictionaryStore::desordres_batiment_eau_pas_eau_potable}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -331,18 +361,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_eau_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_eau_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_eau_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_eau_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_eau_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -365,6 +404,9 @@ "label": "{{dictionaryStore::desordres_batiment_isolation_porte_fenetres}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -405,18 +447,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_isolation_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_isolation_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_isolation_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_isolation_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_isolation_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -439,6 +490,9 @@ "label": "{{dictionaryStore::desordres_batiment_maintenance_ascenseur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -463,18 +517,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_maintenance_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_maintenance_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_maintenance_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_maintenance_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_maintenance_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -497,6 +560,9 @@ "label": "{{dictionaryStore::desordres_batiment_nuisibles_cafards}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -570,18 +636,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_nuisibles_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_nuisibles_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_nuisibles_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_nuisibles_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_nuisibles_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -604,6 +679,9 @@ "label": "{{dictionaryStore::desordres_batiment_securite_sol}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -781,18 +859,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_securite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_securite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_securite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_securite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_securite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -815,6 +902,9 @@ "label": "{{dictionaryStore::desordres_batiment_incendie_odeur_gaz}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -828,18 +918,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_incendie_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_incendie_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_incendie_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_incendie_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_incendie_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -862,6 +961,9 @@ "label": "{{dictionaryStore::desordres_batiment_accessibilite_eclairage}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -925,18 +1027,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_accessibilite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_accessibilite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_accessibilite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_accessibilite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_accessibilite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -959,6 +1070,9 @@ "label": "{{dictionaryStore::desordres_batiment_bruit_exterieur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -972,18 +1086,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_bruit_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_bruit_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_bruit_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_bruit_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_bruit_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1007,7 +1130,10 @@ "src": "/img/form/LOGEMENT/Picto-logement.svg", "alt": "" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormWarning", @@ -1073,6 +1199,9 @@ }, "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1188,7 +1317,7 @@ "footer": [ { "type": "SignalementFormSubscreen", - "slug": "desordres_logement_boutons", + "slug": "desordres_logement_footer", "customCss": "button-group-full-size fr-mt-5v", "components": { "body": [ @@ -1230,6 +1359,9 @@ "label": "Je n'ai pas l'eau potable dans mon logement", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1251,18 +1383,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_eau_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_eau_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_eau_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_eau_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_eau_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1285,6 +1426,9 @@ "label": "{{dictionaryStore::desordres_logement_aeration_aucune_aeration}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1352,18 +1496,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_aeration_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_aeration_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_aeration_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_aeration_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_aeration_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1401,7 +1554,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormRoomList", @@ -1571,18 +1727,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_chauffage_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_chauffage_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_chauffage_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_chauffage_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_chauffage_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1605,6 +1770,9 @@ "slug": "desordres_logement_humidite_piece_a_vivre", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1898,18 +2066,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_humidite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_humidite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_humidite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_humidite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_humidite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1932,6 +2109,9 @@ "label": "{{dictionaryStore::desordres_logement_securite_sol_glissant}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2060,18 +2240,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_securite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_securite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_securite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_securite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_securite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2094,6 +2283,9 @@ "label": "Il n'y a pas d'électricité dans mon logement", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2172,18 +2364,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_electricite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_electricite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_electricite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_electricite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_electricite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2206,6 +2407,9 @@ "label": "{{dictionaryStore::desordres_logement_nuisibles_cafards}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2365,18 +2569,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_nuisibles_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_nuisibles_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_nuisibles_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_nuisibles_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_nuisibles_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2399,6 +2612,9 @@ "label": "J'entends le bruit extérieur, même si je ferme les portes et les fenêtres", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2430,18 +2646,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_bruit_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_bruit_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_bruit_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_bruit_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_bruit_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2464,6 +2689,9 @@ "label": "Mon logement n'est pas éclairé par la lumière du jour. Je dois allumer la lumière en plein jour", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2495,18 +2723,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_lumiere_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_lumiere_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_lumiere_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_lumiere_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_lumiere_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2530,7 +2767,10 @@ "src": "/img/form/LOGEMENT/Picto-logement.svg", "alt": "" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormWarning", diff --git a/assets/json/Signalement/desordres_profile_tiers.json b/assets/json/Signalement/desordres_profile_tiers.json index 754a9b24a..55338474c 100644 --- a/assets/json/Signalement/desordres_profile_tiers.json +++ b/assets/json/Signalement/desordres_profile_tiers.json @@ -21,7 +21,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormSubscreen", @@ -32,31 +35,40 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_les_desordres_previous_autre", - "action": "goto:travailleur_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line", - "conditional": { - "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_particulier' || formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_pro' || formStore.data.signalement_concerne_profil_detail_tiers === 'bailleur'" - } - }, - { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_les_desordres_previous_secours", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line", - "conditional": { - "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours'" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_les_desordres_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_les_desordres_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_les_desordres_previous_autre", + "action": "goto:travailleur_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line", + "conditional": { + "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_particulier' || formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_pro' || formStore.data.signalement_concerne_profil_detail_tiers === 'bailleur'" + } + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_les_desordres_previous_secours", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line", + "conditional": { + "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours'" + } + } + ] } - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_les_desordres_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" } ] } @@ -90,6 +102,9 @@ }, "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -202,7 +217,7 @@ "footer": [ { "type": "SignalementFormSubscreen", - "slug": "desordres_batiment_boutons", + "slug": "desordres_batiment_footer", "customCss": "button-group-full-size fr-mt-5v", "components": { "body": [ @@ -244,6 +259,9 @@ "label": "{{dictionaryStore::desordres_batiment_proprete_interieur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -281,18 +299,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_proprete_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_proprete_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_proprete_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_proprete_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_proprete_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -315,6 +342,9 @@ "label": "{{dictionaryStore::desordres_batiment_eau_pas_eau_potable}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -344,18 +374,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_eau_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_eau_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_eau_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_eau_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_eau_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -378,6 +417,9 @@ "label": "{{dictionaryStore::desordres_batiment_isolation_porte_fenetres}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -418,18 +460,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_isolation_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_isolation_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_isolation_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_isolation_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_isolation_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -452,6 +503,9 @@ "label": "{{dictionaryStore::desordres_batiment_maintenance_ascenseur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -476,18 +530,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_maintenance_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_maintenance_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_maintenance_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_maintenance_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_maintenance_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -510,6 +573,9 @@ "label": "{{dictionaryStore::desordres_batiment_nuisibles_cafards}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -583,18 +649,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_nuisibles_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_nuisibles_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_nuisibles_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_nuisibles_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_nuisibles_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -617,6 +692,9 @@ "label": "{{dictionaryStore::desordres_batiment_securite_sol}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -794,18 +872,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_securite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_securite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_securite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_securite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_securite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -828,6 +915,9 @@ "label": "{{dictionaryStore::desordres_batiment_incendie_odeur_gaz}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -841,18 +931,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_incendie_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_incendie_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_incendie_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_incendie_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_incendie_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -875,6 +974,9 @@ "label": "{{dictionaryStore::desordres_batiment_accessibilite_eclairage}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -938,18 +1040,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_accessibilite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_accessibilite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_accessibilite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_accessibilite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_accessibilite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -972,6 +1083,9 @@ "label": "{{dictionaryStore::desordres_batiment_bruit_exterieur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -985,18 +1099,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_batiment_bruit_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_batiment_bruit_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_batiment_bruit_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_batiment_bruit_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_batiment_bruit_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1086,6 +1209,9 @@ }, "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1213,7 +1339,7 @@ "footer": [ { "type": "SignalementFormSubscreen", - "slug": "desordres_logement_boutons", + "slug": "desordres_logement_footer", "customCss": "button-group-full-size fr-mt-5v", "components": { "body": [ @@ -1255,6 +1381,9 @@ "label": "{{dictionaryStore::desordres_logement_eau_eau_potable}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1276,18 +1405,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_eau_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_eau_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_eau_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_eau_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_eau_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1310,6 +1448,9 @@ "label": "{{dictionaryStore::desordres_logement_aeration_aucune_aeration}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1381,18 +1522,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_aeration_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_aeration_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_aeration_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_aeration_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_aeration_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1430,7 +1580,10 @@ "label": "Je ne sais pas ", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormRoomList", @@ -1600,18 +1753,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_chauffage_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_chauffage_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_chauffage_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_chauffage_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_chauffage_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1634,6 +1796,9 @@ "slug": "desordres_logement_humidite_piece_a_vivre", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1858,18 +2023,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_humidite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_humidite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_humidite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_humidite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_humidite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1892,6 +2066,9 @@ "label": "{{dictionaryStore::desordres_logement_securite_sol_glissant}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2020,18 +2197,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_securite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_securite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_securite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_securite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_securite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2054,6 +2240,9 @@ "label": "{{dictionaryStore::desordres_logement_electricite_pas_electricite}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2136,18 +2325,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_electricite_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_electricite_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_electricite_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_electricite_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_electricite_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2170,6 +2368,9 @@ "label": "{{dictionaryStore::desordres_logement_nuisibles_cafards}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2345,18 +2546,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_nuisibles_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_nuisibles_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_nuisibles_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_nuisibles_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_nuisibles_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2379,6 +2589,9 @@ "label": "{{dictionaryStore::desordres_logement_bruit_exterieur}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2410,18 +2623,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_bruit_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_bruit_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_bruit_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_bruit_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_bruit_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2444,6 +2666,9 @@ "label": "{{dictionaryStore::desordres_logement_lumiere_pas_lumiere}}", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -2475,18 +2700,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_lumiere_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_lumiere_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_lumiere_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_lumiere_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_lumiere_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2506,23 +2740,35 @@ { "type": "SignalementFormRoomList", "label": "", - "slug": "desordres_logement_proprete_pieces" + "slug": "desordres_logement_proprete_pieces", + "accessibility": { + "focus": true + } } ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "desordres_logement_proprete_previous", - "action": "resolve:findPreviousScreen", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "desordres_logement_proprete_next", - "action": "resolve.save:findNextScreen", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "desordres_logement_proprete_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "desordres_logement_proprete_next", + "action": "resolve.save:findNextScreen", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "desordres_logement_proprete_previous", + "action": "resolve:findPreviousScreen", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -2546,7 +2792,10 @@ "src": "/img/form/LOGEMENT/Picto-logement.svg", "alt": "" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormWarning", diff --git a/assets/json/Signalement/questions_profile_bailleur.json b/assets/json/Signalement/questions_profile_bailleur.json index cf4c4777a..03eb6c126 100644 --- a/assets/json/Signalement/questions_profile_bailleur.json +++ b/assets/json/Signalement/questions_profile_bailleur.json @@ -15,7 +15,8 @@ }, "accessibility": { "name": "organizationName", - "autocomplete": "organization" + "autocomplete": "organization", + "focus": true } }, { @@ -27,7 +28,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -63,18 +65,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "vos_coordonnees_tiers_previous", - "action": "goto:signalement_concerne", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "vos_coordonnees_tiers_next", - "action": "goto.save:coordonnees_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "vos_coordonnees_tiers_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "vos_coordonnees_tiers_next", + "action": "goto.save:coordonnees_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "vos_coordonnees_tiers_previous", + "action": "goto:signalement_concerne", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -95,7 +106,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -137,18 +149,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_occupant_previous", - "action": "goto:vos_coordonnees_tiers", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_occupant_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_occupant_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_occupant_previous", + "action": "goto:vos_coordonnees_tiers", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -171,7 +192,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -195,18 +219,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -226,18 +259,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -266,7 +308,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -355,18 +400,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -391,7 +445,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -438,17 +495,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -487,7 +553,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -639,18 +708,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -669,6 +747,9 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } }, { @@ -689,18 +770,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -729,7 +819,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormInfo", @@ -829,18 +922,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -858,18 +960,27 @@ "components": { "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_situation_occupant_previous", - "action": "goto:bail_dpe", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_situation_occupant_next", - "action": "goto.save:logement_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_situation_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_situation_occupant_next", + "action": "goto.save:logement_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_situation_occupant_previous", + "action": "goto:bail_dpe", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -898,7 +1009,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -955,18 +1069,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "logement_social_previous", - "action": "goto:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "logement_social_next", - "action": "goto.save:travailleur_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "logement_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "logement_social_next", + "action": "goto.save:travailleur_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "logement_social_previous", + "action": "goto:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -995,7 +1118,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1041,18 +1167,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "travailleur_social_previous", - "action": "goto:logement_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "travailleur_social_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "travailleur_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "travailleur_social_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "travailleur_social_previous", + "action": "goto:logement_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1072,17 +1207,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1112,7 +1256,10 @@ "label": "Je n'ai pas d'assurance logement", "value": "pas_assurance_logement" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextarea", @@ -1141,18 +1288,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1168,7 +1324,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_visite", - "label": "Je comprends qu'une visite du logement pourra être faite pour évaluer l'état du logement." + "label": "Je comprends qu'une visite du logement pourra être faite pour évaluer l'état du logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1183,18 +1342,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1220,6 +1388,9 @@ "slug": "informations_complementaires_situation_bailleur_date_effet_bail", "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -1356,18 +1527,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "informations_complementaires_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Enregistrer", - "slug": "informations_complementaires_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "informations_complementaires_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Enregistrer", + "slug": "informations_complementaires_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "informations_complementaires_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1387,18 +1567,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1427,7 +1616,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", @@ -1466,7 +1658,10 @@ "label": "Compléter mon signalement", "slug": "signalement_incomplet_complete", "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-mb-3v" + "customCss": "fr-mb-3v", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormButton", diff --git a/assets/json/Signalement/questions_profile_bailleur_occupant.json b/assets/json/Signalement/questions_profile_bailleur_occupant.json index 569e352eb..b79ae5221 100644 --- a/assets/json/Signalement/questions_profile_bailleur_occupant.json +++ b/assets/json/Signalement/questions_profile_bailleur_occupant.json @@ -22,7 +22,10 @@ "label": "Monsieur", "value": "mr" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -81,18 +84,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "vos_coordonnees_occupant_previous", - "action": "goto:signalement_concerne", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "vos_coordonnees_occupant_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "vos_coordonnees_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "vos_coordonnees_occupant_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "vos_coordonnees_occupant_previous", + "action": "goto:signalement_concerne", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -115,7 +127,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -139,18 +154,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:vos_coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:vos_coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -170,18 +194,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -210,7 +243,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -299,18 +335,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -335,7 +380,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -381,18 +429,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -431,7 +488,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -583,18 +643,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -613,6 +682,9 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } }, { @@ -633,18 +705,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -660,7 +741,10 @@ "type": "SignalementFormDate", "label": "A quelle date avez-vous emménagé dans le logement ?", "hint": "Si vous ne connaissez pas la date exacte, sélectionnez un jour du mois d'emménagement", - "slug": "bail_dpe_date_emmenagement" + "slug": "bail_dpe_date_emmenagement", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -703,18 +787,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:type_logement_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:type_logement_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -732,18 +825,27 @@ "components": { "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_situation_occupant_previous", - "action": "goto:bail_dpe", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_situation_occupant_next", - "action": "goto.save:logement_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_situation_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_situation_occupant_next", + "action": "goto.save:logement_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_situation_occupant_previous", + "action": "goto:bail_dpe", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -768,7 +870,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormWarning", @@ -845,18 +950,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "logement_social_previous", - "action": "goto:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "logement_social_next", - "action": "goto.save:travailleur_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "logement_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "logement_social_next", + "action": "goto.save:travailleur_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "logement_social_previous", + "action": "goto:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -885,7 +999,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -905,18 +1022,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "travailleur_social_previous", - "action": "goto:logement_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "travailleur_social_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "travailleur_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "travailleur_social_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "travailleur_social_previous", + "action": "goto:logement_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -936,17 +1062,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -976,7 +1111,10 @@ "label": "Je n'ai pas d'assurance logement", "value": "pas_assurance_logement" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextarea", @@ -1024,18 +1162,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1051,7 +1198,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_visite", - "label": "Je comprends qu'une visite du logement pourra être faite pour évaluer l'état du logement." + "label": "Je comprends qu'une visite du logement pourra être faite pour évaluer l'état du logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1066,18 +1216,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:info_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:info_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1113,7 +1272,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1182,18 +1344,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "informations_complementaires_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Enregistrer", - "slug": "informations_complementaires_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "informations_complementaires_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Enregistrer", + "slug": "informations_complementaires_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "informations_complementaires_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1213,18 +1384,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1253,7 +1433,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", @@ -1292,7 +1475,10 @@ "label": "Compléter mon signalement", "slug": "signalement_incomplet_complete", "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-mb-3v" + "customCss": "fr-mb-3v", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormButton", diff --git a/assets/json/Signalement/questions_profile_locataire.json b/assets/json/Signalement/questions_profile_locataire.json index 8c80b44b6..1cc9b0ed7 100644 --- a/assets/json/Signalement/questions_profile_locataire.json +++ b/assets/json/Signalement/questions_profile_locataire.json @@ -109,7 +109,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -180,18 +181,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_bailleur_previous", - "action": "goto:vos_coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_bailleur_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_bailleur_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_bailleur_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_bailleur_previous", + "action": "goto:vos_coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -214,7 +224,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -238,18 +251,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:coordonnees_bailleur", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:coordonnees_bailleur", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -269,18 +291,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -309,7 +340,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -398,18 +432,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -434,7 +477,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -480,18 +526,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -530,7 +585,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -682,18 +740,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -712,6 +779,9 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } }, { @@ -732,18 +802,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -759,7 +838,10 @@ "type": "SignalementFormDate", "label": "A quelle date avez-vous emménagé dans le logement ?", "hint": "Si vous ne connaissez pas la date exacte, sélectionnez un jour du mois d'emménagement", - "slug": "bail_dpe_date_emmenagement" + "slug": "bail_dpe_date_emmenagement", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -878,18 +960,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -907,18 +998,27 @@ "components": { "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_situation_occupant_previous", - "action": "goto:bail_dpe", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_situation_occupant_next", - "action": "goto.save:logement_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_situation_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_situation_occupant_next", + "action": "goto.save:logement_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_situation_occupant_previous", + "action": "goto:bail_dpe", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -943,7 +1043,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormWarning", @@ -1020,18 +1123,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "logement_social_previous", - "action": "goto:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "logement_social_next", - "action": "goto.save:travailleur_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "logement_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "logement_social_next", + "action": "goto.save:travailleur_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "logement_social_previous", + "action": "goto:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1056,7 +1168,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1094,18 +1209,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "travailleur_social_previous", - "action": "goto:logement_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "travailleur_social_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "travailleur_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "travailleur_social_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "travailleur_social_previous", + "action": "goto:logement_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1125,17 +1249,29 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure", + "accessibility": { + "focus": true + } + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1160,7 +1296,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormInfo", @@ -1235,18 +1374,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1262,7 +1410,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_prevenir_bailleur", - "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) de mon logement." + "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) de mon logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1282,18 +1433,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:info_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:info_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1329,7 +1489,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1409,18 +1572,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "informations_complementaires_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Enregistrer", - "slug": "informations_complementaires_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "informations_complementaires_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Enregistrer", + "slug": "informations_complementaires_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "informations_complementaires_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1440,18 +1612,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1480,7 +1661,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", diff --git a/assets/json/Signalement/questions_profile_service_secours.json b/assets/json/Signalement/questions_profile_service_secours.json index 6fb8d23eb..13b86cc37 100644 --- a/assets/json/Signalement/questions_profile_service_secours.json +++ b/assets/json/Signalement/questions_profile_service_secours.json @@ -15,7 +15,8 @@ }, "accessibility": { "name": "organizationName", - "autocomplete": "organization" + "autocomplete": "organization", + "focus": true } }, { @@ -27,7 +28,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -63,18 +65,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "vos_coordonnees_tiers_previous", - "action": "goto:signalement_concerne", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "vos_coordonnees_tiers_next", - "action": "goto.save:coordonnees_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "vos_coordonnees_tiers_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "vos_coordonnees_tiers_next", + "action": "goto.save:coordonnees_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "vos_coordonnees_tiers_previous", + "action": "goto:signalement_concerne", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -96,7 +107,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -140,18 +152,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_occupant_previous", - "action": "goto:vos_coordonnees_tiers", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_occupant_next", - "action": "goto.save:coordonnees_bailleur", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_occupant_next", + "action": "goto.save:coordonnees_bailleur", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_occupant_previous", + "action": "goto:vos_coordonnees_tiers", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -176,7 +197,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -246,18 +268,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_bailleur_previous", - "action": "goto:coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_bailleur_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_bailleur_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_bailleur_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_bailleur_previous", + "action": "goto:coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -280,7 +311,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -304,18 +338,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:coordonnees_bailleur", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:coordonnees_bailleur", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -335,18 +378,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -375,7 +427,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -464,18 +519,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -500,7 +564,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -547,18 +614,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -597,7 +673,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -749,18 +828,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -779,23 +867,35 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } } ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -824,7 +924,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormInfo", @@ -924,18 +1027,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -955,17 +1067,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -994,7 +1115,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1052,18 +1176,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1083,7 +1216,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_prevenir_bailleur", - "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement." + "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1103,18 +1239,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:info_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:info_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1134,18 +1279,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1174,7 +1328,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", @@ -1213,7 +1370,10 @@ "label": "Compléter mon signalement", "slug": "signalement_incomplet_complete", "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-mb-3v" + "customCss": "fr-mb-3v", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormButton", diff --git a/assets/json/Signalement/questions_profile_tiers_particulier.json b/assets/json/Signalement/questions_profile_tiers_particulier.json index 24cdd5f3a..2dd61327a 100644 --- a/assets/json/Signalement/questions_profile_tiers_particulier.json +++ b/assets/json/Signalement/questions_profile_tiers_particulier.json @@ -26,6 +26,9 @@ ], "validate": { "required": false + }, + "accessibility": { + "focus": true } }, { @@ -73,18 +76,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "vos_coordonnees_tiers_previous", - "action": "goto:signalement_concerne", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "vos_coordonnees_tiers_next", - "action": "goto.save:coordonnees_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "vos_coordonnees_tiers_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "vos_coordonnees_tiers_next", + "action": "goto.save:coordonnees_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "vos_coordonnees_tiers_previous", + "action": "goto:signalement_concerne", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -105,7 +117,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": "true" } }, { @@ -147,18 +160,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_occupant_previous", - "action": "goto:vos_coordonnees_tiers", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_occupant_next", - "action": "goto.save:coordonnees_bailleur", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_occupant_next", + "action": "goto.save:coordonnees_bailleur", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_occupant_previous", + "action": "goto:vos_coordonnees_tiers", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -182,7 +204,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -200,6 +223,9 @@ "autocomplete": { "isAbsoluteLink": false, "route": "/bailleurs?postcode={{formStore.data.adresse_logement_adresse_detail_code_postal}}&name={{formStore.data.coordonnees_bailleur_nom_autocomplete_textfield}}&sanitize=true" + }, + "accessibility": { + "focus": true } }, { @@ -250,18 +276,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_bailleur_previous", - "action": "goto:coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_bailleur_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_bailleur_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_bailleur_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_bailleur_previous", + "action": "goto:coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -284,7 +319,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -308,18 +346,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:coordonnees_bailleur", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:coordonnees_bailleur", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -339,18 +386,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -379,7 +435,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -468,18 +527,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -504,7 +572,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -551,18 +622,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -601,7 +681,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -753,18 +836,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -783,6 +875,9 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } }, { @@ -803,18 +898,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -843,7 +947,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormInfo", @@ -943,18 +1050,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -972,18 +1088,27 @@ "components": { "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_situation_occupant_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_situation_occupant_next", - "action": "goto.save:logement_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_situation_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_situation_occupant_next", + "action": "goto.save:logement_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_situation_occupant_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1012,7 +1137,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1069,18 +1197,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "logement_social_previous", - "action": "goto:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "logement_social_next", - "action": "goto.save:travailleur_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "logement_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "logement_social_next", + "action": "goto.save:travailleur_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "logement_social_previous", + "action": "goto:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1109,7 +1246,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1155,18 +1295,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "travailleur_social_previous", - "action": "goto:logement_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "travailleur_social_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "travailleur_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "travailleur_social_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "travailleur_social_previous", + "action": "goto:logement_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1186,17 +1335,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1225,7 +1383,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1283,18 +1444,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1310,7 +1480,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_prevenir_bailleur", - "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement." + "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1330,18 +1503,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:info_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:info_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1377,7 +1559,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1472,18 +1657,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "informations_complementaires_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Enregistrer", - "slug": "informations_complementaires_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "informations_complementaires_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Enregistrer", + "slug": "informations_complementaires_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "informations_complementaires_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1503,18 +1697,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1543,7 +1746,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", @@ -1582,7 +1788,10 @@ "label": "Compléter mon signalement", "slug": "signalement_incomplet_complete", "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-mb-3v" + "customCss": "fr-mb-3v", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormButton", diff --git a/assets/json/Signalement/questions_profile_tiers_pro.json b/assets/json/Signalement/questions_profile_tiers_pro.json index 83500a646..377e50b20 100644 --- a/assets/json/Signalement/questions_profile_tiers_pro.json +++ b/assets/json/Signalement/questions_profile_tiers_pro.json @@ -12,7 +12,8 @@ "slug": "vos_coordonnees_tiers_nom_organisme", "accessibility": { "name": "organizationName", - "autocomplete": "organization" + "autocomplete": "organization", + "focus": true } }, { @@ -60,18 +61,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "vos_coordonnees_tiers_previous", - "action": "goto:signalement_concerne", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "vos_coordonnees_tiers_next", - "action": "goto.save:coordonnees_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "vos_coordonnees_tiers_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "vos_coordonnees_tiers_next", + "action": "goto.save:coordonnees_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "vos_coordonnees_tiers_previous", + "action": "goto:signalement_concerne", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -92,7 +102,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -134,18 +145,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_occupant_previous", - "action": "goto:vos_coordonnees_tiers", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_occupant_next", - "action": "goto.save:coordonnees_bailleur", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_occupant_next", + "action": "goto.save:coordonnees_bailleur", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_occupant_previous", + "action": "goto:vos_coordonnees_tiers", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -169,7 +189,8 @@ }, "accessibility": { "name": "lastName", - "autocomplete": "family-name" + "autocomplete": "family-name", + "focus": true } }, { @@ -237,18 +258,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "coordonnees_bailleur_previous", - "action": "goto:coordonnees_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "coordonnees_bailleur_next", - "action": "goto.save:zone_concernee", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "coordonnees_bailleur_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "coordonnees_bailleur_next", + "action": "goto.save:zone_concernee", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "coordonnees_bailleur_previous", + "action": "goto:coordonnees_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -271,7 +301,10 @@ "label": "En savoir plus", "slug": "zone_concernee_savoir_plus", "customCss": "fr-btn--sm fr-badge fr-badge--info", - "ariaControls": "zone_concernee_modal" + "ariaControls": "zone_concernee_modal", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -295,18 +328,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "zone_concernee_zone_previous", - "action": "goto:coordonnees_bailleur", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "zone_concernee_zone_next", - "action": "goto.save:ecran_intermediaire_type_composition", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "zone_concernee_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "zone_concernee_zone_next", + "action": "goto.save:ecran_intermediaire_type_composition", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "zone_concernee_zone_previous", + "action": "goto:coordonnees_bailleur", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -326,18 +368,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_type_composition_previous", - "action": "goto:zone_concernee", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "C'est parti", - "slug": "ecran_intermediaire_type_composition_next", - "action": "goto:type_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_type_composition_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "C'est parti", + "slug": "ecran_intermediaire_type_composition_next", + "action": "goto:type_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_type_composition_previous", + "action": "goto:zone_concernee", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -366,7 +417,10 @@ "label": "Autre", "value": "autre" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormTextfield", @@ -455,18 +509,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_previous", - "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_next", - "action": "goto.save:composition_logement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_next", + "action": "goto.save:composition_logement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_previous", + "action": "goto:ecran_intermediaire_type_composition", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -491,7 +554,10 @@ "label": "Plusieurs pièces", "value": "plusieurs_pieces" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCounter", @@ -538,18 +604,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_previous", - "action": "goto:type_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_next", - "action": "goto.save:type_logement_commodites", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_next", + "action": "goto.save:type_logement_commodites", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_previous", + "action": "goto:type_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -588,7 +663,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormIcon", @@ -740,18 +818,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "type_logement_commodites_previous", - "action": "goto:composition_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "type_logement_commodites_next", - "action": "goto.save:composition_logement_personnes", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "type_logement_commodites_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "type_logement_commodites_next", + "action": "goto.save:composition_logement_personnes", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "type_logement_commodites_previous", + "action": "goto:composition_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -770,6 +857,9 @@ "slug": "composition_logement_nombre_personnes", "validate": { "pattern": "^[0-9]*$" + }, + "accessibility": { + "focus": true } }, { @@ -790,18 +880,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "composition_logement_personnes_previous", - "action": "goto:type_logement_commodites", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "composition_logement_personnes_next", - "action": "goto.save:bail_dpe", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "composition_logement_personnes_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "composition_logement_personnes_next", + "action": "goto.save:bail_dpe", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "composition_logement_personnes_previous", + "action": "goto:type_logement_commodites", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -830,7 +929,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormInfo", @@ -930,18 +1032,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "bail_dpe_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "bail_dpe_next", - "action": "goto.save:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "bail_dpe_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "bail_dpe_next", + "action": "goto.save:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "bail_dpe_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -959,18 +1070,27 @@ "components": { "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_situation_occupant_previous", - "action": "goto:composition_logement_personnes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "ecran_intermediaire_situation_occupant_next", - "action": "goto.save:logement_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_situation_occupant_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "ecran_intermediaire_situation_occupant_next", + "action": "goto.save:logement_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_situation_occupant_previous", + "action": "goto:composition_logement_personnes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -999,7 +1119,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1056,18 +1179,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "logement_social_previous", - "action": "goto:ecran_intermediaire_situation_occupant", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "logement_social_next", - "action": "goto.save:travailleur_social", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "logement_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "logement_social_next", + "action": "goto.save:travailleur_social", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "logement_social_previous", + "action": "goto:ecran_intermediaire_situation_occupant", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1096,7 +1228,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1153,18 +1288,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "travailleur_social_previous", - "action": "goto:logement_social", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "travailleur_social_next", - "action": "goto.save:ecran_intermediaire_les_desordres", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "travailleur_social_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "travailleur_social_next", + "action": "goto.save:ecran_intermediaire_les_desordres", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "travailleur_social_previous", + "action": "goto:logement_social", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1184,17 +1328,26 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "ecran_intermediaire_procedure_previous", - "action": "goto:desordres_renseignes", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "J'y suis presque !", - "slug": "ecran_intermediaire_procedure_next", - "action": "goto:info_procedure" + "type": "SignalementFormSubscreen", + "slug": "ecran_intermediaire_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "J'y suis presque !", + "slug": "ecran_intermediaire_procedure_next", + "action": "goto:info_procedure" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "ecran_intermediaire_procedure_previous", + "action": "goto:desordres_renseignes", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1223,7 +1376,10 @@ "label": "Je ne sais pas", "value": "nsp" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1281,18 +1437,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "info_procedure_utilisation_service_previous", - "action": "goto:ecran_intermediaire_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "info_procedure_utilisation_service_next", - "action": "goto.save:utilisation_service", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "info_procedure_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "info_procedure_utilisation_service_next", + "action": "goto.save:utilisation_service", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "info_procedure_utilisation_service_previous", + "action": "goto:ecran_intermediaire_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1308,7 +1473,10 @@ { "type": "SignalementFormCheckbox", "slug": "utilisation_service_ok_prevenir_bailleur", - "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement." + "label": "Je comprends que {{formStore.props.platformName}} va prévenir le bailleur (propriétaire) du logement.", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormCheckbox", @@ -1328,18 +1496,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "utilisation_service_previous", - "action": "goto:info_procedure", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "utilisation_service_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "utilisation_service_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "utilisation_service_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "utilisation_service_previous", + "action": "goto:info_procedure", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1375,7 +1552,10 @@ "label": "Non", "value": "non" } - ] + ], + "accessibility": { + "focus": true + } }, { "type": "SignalementFormOnlyChoice", @@ -1470,18 +1650,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "informations_complementaires_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Enregistrer", - "slug": "informations_complementaires_next", - "action": "goto.save:validation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "informations_complementaires_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Enregistrer", + "slug": "informations_complementaires_next", + "action": "goto.save:validation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "informations_complementaires_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1501,18 +1690,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "validation_signalement_previous", - "action": "goto:utilisation_service", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Valider mon signalement", - "slug": "validation_signalement_next", - "action": "goto.save:confirmation_signalement", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "type": "SignalementFormSubscreen", + "slug": "validation_signalement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Valider mon signalement", + "slug": "validation_signalement_next", + "action": "goto.save:confirmation_signalement", + "customCss": "fr-btn--icon-left fr-icon-check-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "validation_signalement_previous", + "action": "goto:utilisation_service", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -1541,7 +1739,10 @@ "label": "Accéder à ma page de suivi", "slug": "confirmation_signalement_suivi", "customCss": "fr-btn", - "link": "{{formStore.data.lienSuivi}}" + "link": "{{formStore.data.lienSuivi}}", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormLink", @@ -1580,7 +1781,10 @@ "label": "Compléter mon signalement", "slug": "signalement_incomplet_complete", "action": "goto:ecran_intermediaire_type_composition", - "customCss": "fr-mb-3v" + "customCss": "fr-mb-3v", + "accessibility": { + "focus": true + } }, { "type": "SignalementFormButton", diff --git a/assets/json/Signalement/questions_profile_tous.json b/assets/json/Signalement/questions_profile_tous.json index 89675dde7..d7c0a18dc 100644 --- a/assets/json/Signalement/questions_profile_tous.json +++ b/assets/json/Signalement/questions_profile_tous.json @@ -18,7 +18,8 @@ "label": "Je démarre", "slug": "introduction_go", "action": "goto:adresse_logement_intro", - "customCss": "fr-btn--icon-left fr-icon-check-line" + "customCss": "fr-btn--icon-left fr-icon-check-line", + "validOnEnter": true }, { "type": "SignalementFormLink", @@ -140,18 +141,27 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "adresse_logement_previous", - "action": "goto:adresse_logement_intro", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "adresse_logement_next", - "action": "goto.checkloc:signalement_concerne", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + "type": "SignalementFormSubscreen", + "slug": "adresse_logement_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "adresse_logement_next", + "action": "goto.checkloc:signalement_concerne", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line" + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "adresse_logement_previous", + "action": "goto:adresse_logement_intro", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] + } } ] } @@ -317,30 +327,39 @@ ], "footer": [ { - "type": "SignalementFormButton", - "label": "Précédent", - "slug": "signalement_concerne_previous", - "action": "goto:adresse_logement", - "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "signalement_concerne_next_occupant", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line", - "action": "goto.save:vos_coordonnees_occupant", - "conditional": { - "show": "formStore.data.signalement_concerne_profil === 'logement_occupez'" - } - }, - { - "type": "SignalementFormButton", - "label": "Suivant", - "slug": "signalement_concerne_next_tiers", - "customCss": "fr-btn--icon-right fr-icon-arrow-right-line", - "action": "goto.save:vos_coordonnees_tiers", - "conditional": { - "show": "formStore.data.signalement_concerne_profil === 'autre_logement'" + "type": "SignalementFormSubscreen", + "slug": "signalement_concerne_footer", + "customCss": "button-group-responsive-inverted", + "components": { + "body": [ + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "signalement_concerne_next_occupant", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line", + "action": "goto.save:vos_coordonnees_occupant", + "conditional": { + "show": "formStore.data.signalement_concerne_profil === 'logement_occupez'" + } + }, + { + "type": "SignalementFormButton", + "label": "Suivant", + "slug": "signalement_concerne_next_tiers", + "customCss": "fr-btn--icon-right fr-icon-arrow-right-line", + "action": "goto.save:vos_coordonnees_tiers", + "conditional": { + "show": "formStore.data.signalement_concerne_profil === 'autre_logement'" + } + }, + { + "type": "SignalementFormButton", + "label": "Précédent", + "slug": "signalement_concerne_previous", + "action": "goto:adresse_logement", + "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line" + } + ] } } ] diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue index 003cf2744..1bd999637 100644 --- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue +++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue @@ -19,6 +19,7 @@ v-for="(suggestion, index) in suggestions" :key="index" class="fr-col-12 fr-p-3v fr-text-label--blue-france fr-address-suggestion" + ref="addressSuggestions" tabindex="0" @click="handleClickSuggestion(index)" @keyup="handleKeyboardSuggestion($event, index)" @@ -193,12 +194,12 @@ export default defineComponent({ } }, handleKeyboardSuggestion (event: any, index: number) { - if (event.key === 'Enter') { + if (event.key === ' ' || event.key === 'Spacebar') { this.handleClickSuggestion(index) } else if (event.key === 'ArrowUp' || event.key === 'ArrowDown') { event.preventDefault() - const suggestionElements = document.querySelectorAll('.fr-address-suggestion') - if (suggestionElements.length > 0) { + const suggestionElements = this.$refs.addressSuggestions as HTMLElement[] + if (suggestionElements && suggestionElements.length > 0) { let newIndex = index if (event.key === 'ArrowUp') { newIndex = (index === 0) ? suggestionElements.length - 1 : index - 1 diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue index 0d4b0dc82..d7a593dd4 100644 --- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue +++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue @@ -10,6 +10,7 @@ :validate="validate" :access_name="access_name" :access_autocomplete="access_autocomplete" + :access_focus="access_focus" :hasError="hasError" :error="error" @keydown.down.prevent="handleDownSuggestion" @@ -73,16 +74,6 @@ export default defineComponent({ selectedSuggestionIndex: -1 } }, - mounted () { - if (this.access_focus) { - this.$nextTick(() => { - const element = document.querySelector('#' + this.idAutocomplete + '_input') as HTMLElement - if (element) { - element.focus() - } - }) - } - }, created () { document.addEventListener('click', this.closeAutocomplete) watch( diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue index 1dd3fcf51..0a0ccb98d 100644 --- a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue +++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue @@ -1,7 +1,8 @@