Merge pull request #2628 from MTES-MCT/bugfix/2362-fo-form-recap-deso…

…rdres-different-footer [FO - Form étape désordres] Changer les boutons du footer sur le récap désordres
MTES-MCT · Jun 3, 2024 · a99139f · a99139f
2 parents e7ec95e + 655f83b
commit a99139f
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 8 deletions.
diff --git a/assets/json/Signalement/desordres_profile_occupant.json b/assets/json/Signalement/desordres_profile_occupant.json
@@ -2544,16 +2544,42 @@
               {
                 "type": "SignalementFormButton",
                 "label": "Je passe à la suite",
-                "slug": "desordres_renseignes_next",
+                "slug": "desordres_renseignes_next_no_disorder",
                 "action": "goto:ecran_intermediaire_procedure",
-                "customCss": "fr-mb-3v"
+                "customCss": "fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === false"
+                }
               },
               {
                 "type": "SignalementFormButton",
                 "label": "Je renseigne les désordres",
+                "slug": "desordres_renseignes_previous_no_disorder",
+                "action": "resolve:findPreviousScreen",
+                "customCss": "fr-btn--secondary fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === false"
+                }
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Suivant",
+                "slug": "desordres_renseignes_next",
+                "action": "goto:ecran_intermediaire_procedure",
+                "customCss": "fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === true"
+                }
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Précédent",
                 "slug": "desordres_renseignes_previous",
                 "action": "resolve:findPreviousScreen",
-                "customCss": "fr-btn--secondary fr-mb-3v"
+                "customCss": "fr-btn--secondary fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === true"
+                }
               }
             ]
           }

diff --git a/assets/json/Signalement/desordres_profile_tiers.json b/assets/json/Signalement/desordres_profile_tiers.json
@@ -2560,29 +2560,62 @@
               {
                 "type": "SignalementFormButton",
                 "label": "Je passe à la suite",
-                "slug": "desordres_renseignes_next_autre",
+                "slug": "desordres_renseignes_next_autre_no_disorder",
                 "action": "goto:ecran_intermediaire_procedure",
                 "customCss": "fr-mb-3v",
                 "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'"
+                  "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') && formStore.hasDesordre('desordres_') === false"
                 }
               },
               {
                 "type": "SignalementFormButton",
                 "label": "Je passe à la suite",
-                "slug": "desordres_renseignes_next_secours",
+                "slug": "desordres_renseignes_next_secours_no_disorder",
                 "action": "goto:utilisation_service",
                 "customCss": "fr-mb-3v",
                 "conditional": {
-                  "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours'"
+                  "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours' && formStore.hasDesordre('desordres_') === false"
                 }
               },
               {
                 "type": "SignalementFormButton",
                 "label": "Je renseigne les désordres",
+                "slug": "desordres_renseignes_previous_no_disorder",
+                "action": "resolve:findPreviousScreen",
+                "customCss": "fr-btn--secondary fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === false"
+                }
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Suivant",
+                "slug": "desordres_renseignes_next_autre",
+                "action": "goto:ecran_intermediaire_procedure",
+                "customCss": "fr-mb-3v",
+                "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') && formStore.hasDesordre('desordres_') === true"
+                }
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Suivant",
+                "slug": "desordres_renseignes_next_secours",
+                "action": "goto:utilisation_service",
+                "customCss": "fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours' && formStore.hasDesordre('desordres_') === true"
+                }
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Précédent",
                 "slug": "desordres_renseignes_previous",
                 "action": "resolve:findPreviousScreen",
-                "customCss": "fr-btn--secondary fr-mb-3v"
+                "customCss": "fr-btn--secondary fr-mb-3v",
+                "conditional": {
+                  "show": "formStore.hasDesordre('desordres_') === true"
+                }
               }
             ]
           }