provide value motif via data-attribute #3381

MTES-MCT · Dec 3, 2024 · c7966a3 · c7966a3
1 parent 855609c
commit c7966a3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/assets/scripts/vanilla/controllers/back_signalement_view/back_view_signalement.js b/assets/scripts/vanilla/controllers/back_signalement_view/back_view_signalement.js
@@ -171,6 +171,15 @@ modalsElement.forEach(modalElement => {
   })
 })
 
+document.querySelectorAll('button[data-cloture-type]').forEach(button => {
+  button.addEventListener('click', (e) => {
+    const element = e.target;
+    if (element && element?.dataset) {
+      document.getElementById('cloture_type').value = element.dataset.clotureType
+    }
+  });
+});
+
 document?.getElementById('signalement-add-suivi-notify-usager')?.addEventListeners('change', (e) => {
   document.getElementById('signalement-add-suivi-submit').textContent = (e.target.checked) ? 'Envoyer le suivi à l\'usager' : 'Enregistrer le suivi interne'
 })

diff --git a/src/Controller/Back/SignalementController.php b/src/Controller/Back/SignalementController.php
@@ -88,11 +88,7 @@ public function viewSignalement(
             }
         }
         $isClosedForMe = $isClosedForMe ?? Signalement::STATUS_CLOSED === $signalement->getStatut();
-        $clotureForm = $this->createForm(type: ClotureType::class, options: [
-            'is_admin_territory' => $this->isGranted('ROLE_ADMIN_TERRITORY'),
-            'is_accepted' => $isAccepted,
-            'is_affected' => $isAffected,
-        ]);
+        $clotureForm = $this->createForm(ClotureType::class);
         $clotureForm->handleRequest($request);
         $eventParams = [];
         if ($clotureForm->isSubmitted() && $clotureForm->isValid()) {

diff --git a/src/Form/ClotureType.php b/src/Form/ClotureType.php
@@ -13,14 +13,6 @@ class ClotureType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $clotureType = 'partner';
-        if ($options['is_admin_territory']) {
-            $clotureType = 'all';
-            if ($options['is_affected'] && $options['is_accepted']) {
-                $clotureType = 'partner';
-            }
-        }
-
         $builder
             ->add('motif', EnumType::class, [
                 'class' => MotifCloture::class,
@@ -39,17 +31,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'fr-hint-text',
                 ],
             ])
-            ->add('type', HiddenType::class, ['data' => $clotureType]);
+            ->add('type', HiddenType::class);
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => null,
             'allow_extra_fields' => true,
-            'is_admin_territory' => false,
-            'is_affected' => false,
-            'is_accepted' => false,
             'attr' => [
                 'id' => 'cloture_form',
             ],

diff --git a/templates/_partials/_modal_cloture.html.twig b/templates/_partials/_modal_cloture.html.twig
@@ -69,6 +69,7 @@
                                     <button class="fr-btn fr-icon-check-line"
                                             form="cloture_form"
                                             type="submit"
+                                            data-cloture-type="all"
                                             disabled>
                                         Clôturer pour tous les partenaires
                                     </button>
@@ -78,6 +79,7 @@
                                         <button class="fr-btn fr-icon-check-line"
                                                 form="cloture_form"
                                                 type="submit"
+                                                data-cloture-type="partner"
                                                 disabled>
                                             Clôturer pour {{ app.user.partner ? app.user.partner.nom }}
                                         </button>
@@ -87,7 +89,7 @@
                                 <li>
                                     <button class="fr-btn fr-icon-check-line"
                                             form="cloture_form"
-                                            value="partner"
+                                            data-cloture-type="partner"
                                             type="submit"
                                             disabled>
                                         Clôturer pour {{ app.user.partner ? app.user.partner.nom }}