correction pour la sélection d'un chauffagiste affecté à une intervention lors de la création de l'intervention

src/Controller/InterventionController.php

@@ -4,8 +4,8 @@ namespace App\Controller;
 
 use App\Entity\Intervention;
 use App\Form\InterventionType;
-use App\Form\RemarqueType;
 use App\Repository\InterventionRepository;
+use App\Repository\UserRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -25,12 +25,16 @@ class InterventionController extends AbstractController
     }
 
     #[Route('/new', name: 'app_intervention_new', methods: ['GET', 'POST'])]
-    public function new(Request $request, EntityManagerInterface $entityManager, InterventionRepository $interventionRepository): Response
+    public function new(Request $request, EntityManagerInterface $entityManager, InterventionRepository $interventionRepository, UserRepository $userRepository): Response
     {
         $this->denyUnlessAdminOrSecretaire();
 
         $intervention = new Intervention();
-        $form = $this->createForm(InterventionType::class, $intervention);
+        $users = $userRepository->findAll();
+
+        $form = $this->createForm(InterventionType::class, $intervention, [
+            'users' => $users,
+        ]);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -75,43 +79,16 @@ class InterventionController extends AbstractController
         ]);
     }
 
-    #[Route('/mes-interventions', name: 'app_intervention_mes', methods: ['GET'])]
-    public function mesInterventions(InterventionRepository $interventionRepository): Response
-    {
-        $this->denyAccessUnlessGranted('ROLE_CHAUFFAGISTE');
-
-        $user = $this->getUser();
-        $interventions = $interventionRepository->findBy(['user' => $user]);
-
-        return $this->render('intervention/indexChauffagiste.html.twig', [
-            'interventions' => $interventions,
-        ]);
-    }
-
-    #[Route('/{id}', name: 'app_intervention_show', methods: ['GET'])]
-    public function show(Intervention $intervention): Response
-    {
-        // ✅ Si l'utilisateur est un chauffagiste, il ne peut voir que ses interventions
-        if ($this->isGranted('ROLE_CHAUFFAGISTE')) {
-            if ($intervention->getUser() !== $this->getUser()) {
-                throw $this->createAccessDeniedException('Accès refusé à cette intervention.');
-            }
-        } else {
-            // ✅ Sinon, seuls admin/secrétaire peuvent accéder à tout
-            $this->denyUnlessAdminOrSecretaire();
-        }
-
-        return $this->render('intervention/show.html.twig', [
-            'intervention' => $intervention,
-        ]);
-    }
-
     #[Route('/{id}/edit', name: 'app_intervention_edit', methods: ['GET', 'POST'])]
-    public function edit(Request $request, Intervention $intervention, EntityManagerInterface $entityManager, InterventionRepository $interventionRepository): Response
+    public function edit(Request $request, Intervention $intervention, EntityManagerInterface $entityManager, InterventionRepository $interventionRepository, UserRepository $userRepository): Response
     {
         $this->denyUnlessAdminOrSecretaire();
 
-        $form = $this->createForm(InterventionType::class, $intervention);
+        $users = $userRepository->findAll();
+
+        $form = $this->createForm(InterventionType::class, $intervention, [
+            'users' => $users,
+        ]);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -143,7 +120,7 @@ class InterventionController extends AbstractController
                     ->andWhere('i.vehicle = :vehicule')
                     ->andWhere('i != :current')
                     ->setParameter('time', $timestamp)
-                    ->setParameter('user', $chauffagiste)
+                    ->setParameter('vehicule', $vehicule)
                     ->setParameter('current', $intervention)
                     ->getQuery()
                     ->getResult();
@@ -167,6 +144,35 @@ class InterventionController extends AbstractController
         ]);
     }
 
+    #[Route('/mes-interventions', name: 'app_intervention_mes', methods: ['GET'])]
+    public function mesInterventions(InterventionRepository $interventionRepository): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_CHAUFFAGISTE');
+
+        $user = $this->getUser();
+        $interventions = $interventionRepository->findBy(['user' => $user]);
+
+        return $this->render('intervention/indexChauffagiste.html.twig', [
+            'interventions' => $interventions,
+        ]);
+    }
+
+    #[Route('/{id}', name: 'app_intervention_show', methods: ['GET'])]
+    public function show(Intervention $intervention): Response
+    {
+        if ($this->isGranted('ROLE_CHAUFFAGISTE')) {
+            if ($intervention->getUser() !== $this->getUser()) {
+                throw $this->createAccessDeniedException('Accès refusé à cette intervention.');
+            }
+        } else {
+            $this->denyUnlessAdminOrSecretaire();
+        }
+
+        return $this->render('intervention/show.html.twig', [
+            'intervention' => $intervention,
+        ]);
+    }
+
     #[Route('/{id}', name: 'app_intervention_delete', methods: ['POST'])]
     public function delete(Request $request, Intervention $intervention, EntityManagerInterface $entityManager): Response
     {

src/Form/InterventionType.php

@@ -7,7 +7,6 @@ use App\Entity\Intervention;
 use App\Entity\Stock;
 use App\Entity\Utilisateur;
 use App\Entity\Vehicle;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
@@ -19,6 +18,18 @@ class InterventionType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
+        $intervention = $builder->getData();
+        $allUsers = $options['users'] ?? [];
+
+        $chauffagistes = array_filter($allUsers, fn(Utilisateur $user) =>
+        in_array('ROLE_CHAUFFAGISTE', $user->getRoles(), true)
+        );
+
+        $currentUser = $intervention->getUser();
+        if ($currentUser && !in_array($currentUser, $chauffagistes, true)) {
+            $chauffagistes[] = $currentUser;
+        }
+
         $builder
             ->add('Wording', TextType::class)
             ->add('Timestamp', DateTimeType::class, [
@@ -29,15 +40,11 @@ class InterventionType extends AbstractType
             ->add('Status', TextType::class)
             ->add('user', EntityType::class, [
                 'class' => Utilisateur::class,
-                'choice_label' => function (Utilisateur $user) {
-                    return $user->getFirstName() . ' ' . $user->getLastName();
-                },
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('u')
-                        ->where('JSON_CONTAINS(u.roles, :role) = 1')
-                        ->setParameter('role', '"ROLE_CHAUFFAGISTE"');
-                },
+                'choice_label' => fn(Utilisateur $user) => $user->getFirstName() . ' ' . $user->getLastName(),
+                'choices' => $chauffagistes,
                 'label' => 'Chauffagiste assigné',
+                'placeholder' => 'Sélectionnez un chauffagiste',
+                'required' => true,
             ])
             ->add('fault', EntityType::class, [
                 'class' => Fault::class,
@@ -60,6 +67,7 @@ class InterventionType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => Intervention::class,
+            'users' => [],
         ]);
     }
 }

templates/base.html.twig

@@ -107,7 +107,6 @@
             {% if is_granted('ROLE_SECRETAIRE') %}
                 <li><a href="{{ path('secretaire_dashboard') }}">Dashboard Secrétaire</a></li>
                 <li><a href="{{ path('app_intervention_index') }}">Gérer les interventions</a></li>
-                <li><a href="{{ path('app_user_index') }}">Créer un chauffagiste</a></li>
                 <li><a href="{{ path('app_vehicle_index') }}">Gérer les véhicules</a></li>
                 <li><a href="{{ path('app_stock_index') }}">Gérer les stocks</a></li>
                 <li><a href="{{ path('app_fault_index') }}">Gérer les pannes</a></li>