Commit 3daba317 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Second lot de correctif suite à la visio du 11/07/2022

parent b22fa596
Loading
Loading
Loading
Loading
+18 −2
Changes for module/Formation/src/Formation/Controller/SessionController.php: 18 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,8 +4,11 @@ namespace Formation\Controller;

use Application\Controller\AbstractController;
use Application\Entity\Db\These;
use Formation\Entity\Db\Formation;
use Formation\Entity\Db\SessionStructureComplementaire;
use Formation\Service\Formation\FormationServiceAwareTrait;
use Formation\Service\Presence\PresenceServiceAwareTrait;
use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireServiceAwareTrait;
use Laminas\Http\Response;
use Notification\Exception\NotificationException;
use Structure\Service\Etablissement\EtablissementServiceAwareTrait;
@@ -35,6 +38,7 @@ class SessionController extends AbstractController
    use NotificationServiceAwareTrait;
    use PresenceServiceAwareTrait;
    use SessionServiceAwareTrait;
    use SessionStructureComplementaireServiceAwareTrait;

    use SessionFormAwareTrait;

@@ -85,7 +89,20 @@ class SessionController extends AbstractController
                /** @var Etat $enPrepration */
                $enPrepration = $this->getEntityManager()->getRepository(Etat::class)->findOneBy(["code" => Etat::CODE_PREPARATION]);
                $session->setEtat($enPrepration);

                $this->getSessionService()->update($session);

                $ns = new SessionStructureComplementaire();
                $ns->setSession($session);

                switch ($session->getType()) {
                    case Formation::TYPE_CODE_TRAVERSAL :
                        $ns->setStructure($session->getSite()->getStructure());
                        break;
                    case Formation::TYPE_CODE_SPECIFIQUE :
                        $ns->setStructure($session->getTypeStructure());
                }
                if ($ns->getStructure()) $this->getSessionStructureComplementaireService()->create($ns);
            }
        }

@@ -93,7 +110,7 @@ class SessionController extends AbstractController
            'title' => "Ajout d'une session de formation",
            'form' => $form,
        ]);
        $vm->setTemplate('formation/default/default-form');
        $vm->setTemplate('formation/session/modifier');
        return $vm;
    }

@@ -118,7 +135,6 @@ class SessionController extends AbstractController
            'title' => "Modification d'une session de formation",
            'form' => $form,
        ]);
        $vm->setTemplate('formation/default/default-form');
        return $vm;
    }

+4 −0
Changes for module/Formation/src/Formation/Controller/SessionControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Formation\Controller;

use Formation\Service\Formation\FormationService;
use Formation\Service\Presence\PresenceService;
use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireService;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Structure\Service\Etablissement\EtablissementService;
@@ -35,6 +36,7 @@ class SessionControllerFactory {
         * @var NotificationService $notificationService
         * @var PresenceService $presenceService
         * @var SessionService $sessionService
         * @var SessionStructureComplementaireService $sessionStructureComplementaireService
         */
        $entityManager = $container->get('doctrine.entitymanager.orm_default');
        $etablissementService = $container->get(EtablissementService::class);
@@ -44,6 +46,7 @@ class SessionControllerFactory {
        $notificationService = $container->get(NotificationService::class);
        $presenceService = $container->get(PresenceService::class);
        $sessionService = $container->get(SessionService::class);
        $sessionStructureComplementaireService = $container->get(SessionStructureComplementaireService::class);

        /**
         * @var SessionForm $sessionForm
@@ -63,6 +66,7 @@ class SessionControllerFactory {
        $controller->setNotificationService($notificationService);
        $controller->setPresenceService($presenceService);
        $controller->setSessionService($sessionService);
        $controller->setSessionStructureComplementaireService($sessionStructureComplementaireService);
        /** Form ******************************************************************************************************/
        $controller->setSessionForm($sessionForm);
        /** Autre *****************************************************************************************************/
+12 −0
Changes for module/Formation/src/Formation/Entity/Db/Formation.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ class Formation implements HistoriqueAwareInterface,
    use HasModaliteTrait;
    use HasTypeTrait;

    const TYPE_CODE_TRAVERSAL = 'T';
    const TYPE_CODE_SPECIFIQUE = 'S';

    private int $id;
    private ?string $libelle = null;
    private ?string $description  = null;
@@ -172,6 +175,15 @@ class Formation implements HistoriqueAwareInterface,
        return $this;
    }

    /**
     * @return string
     */
    public function getCode() : string
    {
        $module = $this->getModule();
        return 'M'.$module->getId() . 'F'.$this->getId();
    }

    /** FONCTION POUR MACRO *******************************************************************************************/

    /**
+7 −0
Changes for module/Formation/src/Formation/Entity/Db/Module.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -86,4 +86,11 @@ class Module implements HistoriqueAwareInterface
        return $this->formations;
    }

    /**
     * @return string
     */
    public function getCode() : string
    {
        return 'M'.$this->getId();
    }
}
 No newline at end of file
+5 −3
Changes for module/Formation/src/Formation/Entity/Db/Repository/SessionRepository.php: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ class SessionRepository extends EntityRepository
            ->leftJoin($alias.".inscriptions", "inscription")->addSelect("inscription")
            ->leftJoin($alias.".seances", "seance")->addSelect("seance")
            ->leftJoin($alias.".etat", "etat")->addSelect("etat")
            ->leftJoin($alias.".structuresComplemenaires", "complement")->addSelect("complement")
            ->leftJoin("complement.structure", "structureSessionInscription")->addSelect("structureSessionInscription")
            ->andWhere("complement.histoDestruction IS NULL")
        ;
        return $qb;
    }
@@ -66,10 +69,9 @@ class SessionRepository extends EntityRepository
        }

        $qb = $this->createQB('session')
            ->andWhere('session.type = :transversale OR session.typeStructure in (:structures)')
            ->setParameter('transversale', HasTypeInterface::TYPE_TRANSVERSALE)
            ->setParameter('structures', $structures)
            ->andWhere('complement.structure in (:structures)')
            ->andWhere('etat.code = :ouverte OR etat.code = :preparation')
            ->setParameter('structures', $structures)
            ->setParameter('ouverte', Etat::CODE_OUVERTE)
            ->setParameter('preparation', Etat::CODE_PREPARATION)
        ;
Loading