Commit c591e91d authored by Johnny Leveneur's avatar Johnny Leveneur
Browse files

correction programmation evenement recurrent

parent 9a734733

module/Atelier/src/Service/Seance/SeanceService.php

+10 −0
Changes for module/Atelier/src/Service/Seance/SeanceService.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Atelier\Service\Seance; 
use Atelier\Entity\Db\Session;

use Atelier\Event\CloturerSession\CloturerSessionEvenementAwareTrait;

use Atelier\Event\ConvoquerSession\ConvoquerSessionEvenementAwareTrait;

use Atelier\Event\RappelSession\RappelSessionEvenementAwareTrait;

use Atelier\Event\RetourSession\RetourSessionEvenementAwareTrait;

use DateInterval;

use DateTime;
@@ -21,6 +22,7 @@ class SeanceService 
    use ProvidesObjectManager;

    use CloturerSessionEvenementAwareTrait;

    use ConvoquerSessionEvenementAwareTrait;

    use RappelSessionEvenementAwareTrait;

    use RetourSessionEvenementAwareTrait;
@@ -138,6 +140,7 @@ class SeanceService 
        }



        $seance = $this->createSeanceWith($session, $jour, $debut, $fin, $lieu);

        $this->gererEvenement($seance);

        $seances[] = $seance;



        $current = DateTime::createFromFormat('Y-m-d', $jourString);
@@ -158,6 +161,7 @@ class SeanceService 
            }

            if ($current > $finRecurrence) break;

            $seance = $this->createSeanceWith($session, $current, $debut, $fin, $lieu);

            $this->gererEvenement($seance);

            $seances[] = $seance;

        }
@@ -178,6 +182,12 @@ class SeanceService 
            } else {

                $message .= "Plus de séance : retrait de la convocation automatique";

            }

            $event = $this->getRappelSessionEvenement()->updateEvent($session);

            if ($event) {

                $message .= "Nouvelle date de rappel automatique : " . $event->getDatePlanification()->format('d/m/Y à H:i');

            } else {

                $message .= "Plus de séance : retrait du rappel automatique";

            }

            $message .= "<br>";

        }

        //}

module/Atelier/src/Service/Seance/SeanceServiceFactory.php

+4 −0
Changes for module/Atelier/src/Service/Seance/SeanceServiceFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Atelier\Service\Seance; 


use Atelier\Event\CloturerSession\CloturerSessionEvenement;

use Atelier\Event\ConvoquerSession\ConvoquerSessionEvenement;

use Atelier\Event\RappelSession\RappelSessionEvenement;

use Atelier\Event\RetourSession\RetourSessionEvenement;

use Doctrine\ORM\EntityManager;

use Interop\Container\ContainerInterface;
@@ -26,16 +27,19 @@ class SeanceServiceFactory 
        /**

         * @var CloturerSessionEvenement $cloturerSessionEvenement

         * @var ConvoquerSessionEvenement $convoquerSessionEvenement

         * @var RappelSessionEvenement $rappelSessionEvenement

         * @var RetourSessionEvenement $retourSessionEvenement

         */

        $cloturerSessionEvenement = $container->get(CloturerSessionEvenement::class);

        $convoquerSessionEvenement = $container->get(ConvoquerSessionEvenement::class);

        $rappelSessionEvenement = $container->get(RappelSessionEvenement::class);

        $retourSessionEvenement = $container->get(RetourSessionEvenement::class);



        $service = new SeanceService();

        $service->setObjectManager($entityManager);

        $service->setCloturerSessionEvenement($cloturerSessionEvenement);

        $service->setConvoquerSessionEvenement($convoquerSessionEvenement);

        $service->setRappelSessionEvenement($rappelSessionEvenement);

        $service->setRetourSessionEvenement($retourSessionEvenement);

        return $service;

    }