...

module/Formation/src/Formation/Controller/SeanceController.php

@@ -151,12 +151,14 @@ class SeanceController extends AbstractActionController
 
     public function gererEvenement(Seance $seance): void
     {
-        if ($seance->isPremiereSeance()) {
+        $first = $seance->isPremiereSeance();
+        $last = $seance->isDerniereSeance();
+        if ($first) {
             $this->getInscriptionClotureEvent()->updateEvent($seance);
             $this->getConvocationEvent()->updateEvent($seance);
             $this->getRappelAgentEvent()->updateEvent($seance);
         }
-        if ($seance->isDerniereSeance()) {
+        if ($last) {
             $this->getDemandeRetourEvent()->updateEvent($seance);
             $this->getSessionClotureEvent()->updateEvent($seance);
         }

module/Formation/src/Formation/Entity/Db/Seance.php

@@ -149,7 +149,7 @@ class Seance implements HistoriqueAwareInterface, HasSourceInterface
                 $asString = $this->getJour()->format('d/m/Y') . " " . $this->getFin();
                 return DateTime::createFromFormat('d/m/Y H:i', $asString);
             case Seance::TYPE_VOLUME :
-                $asString = $this->getVolumeFin()->format('d/m/Y') . " 08:00";
+                $asString = $this->getVolumeFin()->format('d/m/Y') . " 18:00";
                 return DateTime::createFromFormat('d/m/Y H:i', $asString);
         }
         throw new RuntimeException("Le type de seance est inconnu");
@@ -222,7 +222,11 @@ class Seance implements HistoriqueAwareInterface, HasSourceInterface
     public function isDerniereSeance(): bool
     {
         $session = $this->getInstance();
-        $res = ($session->getSeances() === null OR $session->getSeances() === [] OR $this->getDateFin()->format('d/m/Y H:i') === $session->getFin());
+        $isNull = ($session->getSeances() === null);
+        $isEmpty = ($session->getSeances() === []);
+        $isLast = ($this->getDateFin()->format('d/m/Y H:i') === $session->getFin());
+
+        $res = ($isNull OR $isEmpty OR $isLast);
         return $res;
     }