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

Inscription

parent 3ca22259
Loading
Loading
Loading
Loading
+48 −12
Changes for module/Formation/config/merged/formation-instance-inscrit.config.php: 48 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ use Formation\Provider\Privilege\FormationinstanceinscritPrivileges;
use Formation\Provider\Privilege\FormationinstancePrivileges;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceFactory;
use Formation\Service\InscriptionExterne\InscriptionExterneService;
use Formation\Service\InscriptionExterne\InscriptionExterneServiceFactory;
use UnicaenPrivilege\Guard\PrivilegeController;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
@@ -27,10 +29,13 @@ return [
                    'action' => [
                        'afficher-agent',
                        'ajouter-agent',
                        'ajouter-stagiaire-externe',
                        'historiser-agent',
                        'restaurer-agent',
                        'supprimer-agent',
                        'ajouter-stagiaire-externe',
                        'historiser-stagiaire-externe',
                        'restaurer-stagiaire-externe',
                        'supprimer-stagiaire-externe',
                        'envoyer-liste-principale',
                        'envoyer-liste-complementaire',
                        'classer-inscription',
@@ -262,17 +267,6 @@ return [
                            ],
                        ],
                    ],
                    'ajouter-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/ajouter-stagiaire-externe/:session',
                            'defaults' => [
                                /** @see FormationInstanceInscritController::ajouterStagiaireExterneAction() */
                                'controller' => FormationInstanceInscritController::class,
                                'action'     => 'ajouter-stagiaire-externe',
                            ],
                        ],
                    ],
                    'ajouter-agent' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -323,6 +317,47 @@ return [
                            ],
                        ],
                    ],
                    'ajouter-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/ajouter-stagiaire-externe/:session',
                            'defaults' => [
                                /** @see FormationInstanceInscritController::ajouterStagiaireExterneAction() */
                                'controller' => FormationInstanceInscritController::class,
                                'action'     => 'ajouter-stagiaire-externe',
                            ],
                        ],
                    ],
                    'historiser-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/historiser-stagiaire-externe/:inscription-externe',
                            'defaults' => [
                                'controller' => FormationInstanceInscritController::class,
                                'action'     => 'historiser-stagiaire-externe',
                            ],
                        ],
                    ],
                    'restaurer-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/restaurer-stagiaire-externe/:inscription-externe',
                            'defaults' => [
                                'controller' => FormationInstanceInscritController::class,
                                'action'     => 'restaurer-stagiaire-externe',
                            ],
                        ],
                    ],
                    'supprimer-stagiaire-externe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/supprimer-stagiaire-externe/:inscription-externe',
                            'defaults' => [
                                'controller' => FormationInstanceInscritController::class,
                                'action'     => 'supprimer-stagiaire-externe',
                            ],
                        ],
                    ],
                    'envoyer-liste-principale' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -361,6 +396,7 @@ return [
    'service_manager' => [
        'factories' => [
            FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,
            InscriptionExterneService::class => InscriptionExterneServiceFactory::class,
        ],
    ],
    'controllers'     => [
+85 −48
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritController.php: 85 added lines, 48 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ use Formation\Provider\Parametre\FormationParametres;
use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;
use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;
use Formation\Service\InscriptionExterne\InscriptionExterneServiceAwareTrait;
use Formation\Service\Notification\NotificationServiceAwareTrait;
use Formation\Service\StagiaireExterne\StagiaireExterneServiceAwareTrait;
use Laminas\Http\Request;
use Laminas\Http\Response;
use Laminas\Mvc\Controller\AbstractActionController;
@@ -35,15 +37,17 @@ use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
class FormationInstanceInscritController extends AbstractActionController
{
    use AgentServiceAwareTrait;
    use DemandeExterneServiceAwareTrait;
    use EtatInstanceServiceAwareTrait;
    use EtatTypeServiceAwareTrait;
    use DemandeExterneServiceAwareTrait;
    use FormationInstanceServiceAwareTrait;
    use FormationInstanceInscritServiceAwareTrait;
    use InscriptionExterneServiceAwareTrait;
    use MailServiceAwareTrait;
    use NotificationServiceAwareTrait;
    use ParametreServiceAwareTrait;
    use RenduServiceAwareTrait;
    use StagiaireExterneServiceAwareTrait;
    use UserServiceAwareTrait;

    use InscriptionFormAwareTrait;
@@ -108,16 +112,63 @@ class FormationInstanceInscritController extends AbstractActionController
        return $vm;
    }

    public function historiserAgentAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        $inscrit->setListe(null);
        $this->getFormationInstanceInscritService()->historise($inscrit);

        $this->flashMessenger()->addSuccessMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> vient d'être retiré&middot;e des listes.");

        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true);
    }

    public function restaurerAgentAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        $liste = $inscrit->getInstance()->getListeDisponible();

        if ($liste !== null) {
            $inscrit->setListe($liste);
            $this->getFormationInstanceInscritService()->restore($inscrit);
        }
        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true);
    }

    public function supprimerAgentAction() : ViewModel
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") $this->getFormationInstanceInscritService()->delete($inscrit);
            exit();
        }

        $vm = new ViewModel();
        $vm->setTemplate('default/confirmation');
        if ($inscrit !== null) {
            $vm->setVariables([
                'title' => "Suppression de l'inscription de [" . $inscrit->getAgent()->getDenomination() . "]",
                'text' => "La suppression est définitive êtes-vous sûr&middot;e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('formation-instance/supprimer-agent', ["inscrit" => $inscrit->getId()], [], true),
            ]);
        }
        return $vm;
    }

    public function ajouterStagiaireExterneAction() : ViewModel
    {
        $session = $this->getFormationInstanceService()->getRequestedFormationInstance($this, 'session');

        $inscrit = new FormationInstanceInscrit();
        $inscrit->setInstance($session);
        // TODO formulaire dédié...
//        $inscrit = new InscriptionExterne();
//        $inscrit->setSession($session);

        $form = $this->getSelectionAgentForm();
        $form->setAttribute('action', $this->url()->fromRoute('formation-instance/ajouter-stagiaire-externe', ['session' => $session->getId()], [], true));
        $form->bind($inscrit);

        /** @see  StagiaireExterneController::rechercherAction */
        $urlLarge = $this->url()->fromRoute('stagiaire-externe/rechercher', [], [], true);
@@ -127,29 +178,21 @@ class FormationInstanceInscritController extends AbstractActionController
        $sas->setAttribute('placeholder', "Dénomination du stagiaire externe ...");
        $sas->setAutocompleteSource($urlLarge);

//        $request = $this->getRequest();
//        if ($request->isPost()) {
//            $data = $request->getPost();
//            $form->setData($data);
//
//            if ($form->isValid()) {
//                if (!$instance->hasAgent($inscrit->getAgent())) {
//                    $inscrit->setListe($instance->getListeDisponible());
//                    $inscrit->setSource(HasSourceInterface::SOURCE_EMC2);
//                    $this->getFormationInstanceInscritService()->create($inscrit);
//                    $this->getEtatInstanceService()->setEtatActif($inscrit,InscriptionEtats::ETAT_VALIDER_DRH);
//                    $this->getFormationInstanceInscritService()->update($inscrit);
//
//                    $texte = ($instance->getListeDisponible() === FormationInstanceInscrit::PRINCIPALE) ? "principale" : "complémentaire";
//                    $this->flashMessenger()->addSuccessMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> vient d'être ajouté&middot;e en <strong>liste " . $texte . "</strong>.");
//
//                    if ($instance->getFormation()->getRattachement() === Formation::RATTACHEMENT_PREVENTION) $this->getNotificationService()->triggerPrevention($inscrit);
//
//                } else {
//                    $this->flashMessenger()->addErrorMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> est déjà inscrit&middot;e à l'instance de formation.");
//                }
//            }
//        }
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);

            if (isset($data['agent']) && isset($data['agent']['id'])) {
                $stagiaire = $this->getStagiaireExterneService()->getStagiaireExterne($data['agent']['id']);
                $description = (isset($data['description']))?$data['description']:null;
                if (!$session->hasStagiaireExterne($stagiaire)) {
                    $inscrit = $this->getInscriptionExterneService()->createWith($session, $stagiaire,$description);
                    $this->flashMessenger()->addSuccessMessage("Le stagiaire externe <strong>" . $stagiaire->getDenomination() . "</strong> vient d'être ajouté&middot;e.");
                    if ($session->getFormation()->getRattachement() === Formation::RATTACHEMENT_PREVENTION) $this->getNotificationService()->triggerPrevention($inscrit);
                }
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('default/default-form');
@@ -160,38 +203,31 @@ class FormationInstanceInscritController extends AbstractActionController
        return $vm;
    }

        public function historiserAgentAction() : Response
    public function historiserStagiaireExterneAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        $inscrit->setListe(null);
        $this->getFormationInstanceInscritService()->historise($inscrit);
        $inscrit = $this->getInscriptionExterneService()->getRequestedInscriptionExterne($this);
        $this->getInscriptionExterneService()->historise($inscrit);

        $this->flashMessenger()->addSuccessMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> vient d'être retiré&middot;e des listes.");

        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true);
        $this->flashMessenger()->addSuccessMessage("Le stagiaire externe <strong>" . $inscrit->getStagiaire()->getDenomination() . "</strong> vient d'être retiré&middot;e des listes.");
        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getSession()->getId()], [], true);
    }

    public function restaurerAgentAction() : Response
    public function restaurerStagiaireExterneAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        $liste = $inscrit->getInstance()->getListeDisponible();

        if ($liste !== null) {
            $inscrit->setListe($liste);
            $this->getFormationInstanceInscritService()->restore($inscrit);
        }
        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true);
        $inscrit = $this->getInscriptionExterneService()->getRequestedInscriptionExterne($this);
        $this->getInscriptionExterneService()->restore($inscrit);
        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getSession()->getId()], [], true);
    }

    public function supprimerAgentAction() : ViewModel
    public function supprimerStagiaireExterneAction() : ViewModel
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        $inscrit = $this->getInscriptionExterneService()->getRequestedInscriptionExterne($this);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") $this->getFormationInstanceInscritService()->delete($inscrit);
            if ($data["reponse"] === "oui") $this->getInscriptionExterneService()->delete($inscrit);
            exit();
        }

@@ -199,14 +235,15 @@ class FormationInstanceInscritController extends AbstractActionController
        $vm->setTemplate('default/confirmation');
        if ($inscrit !== null) {
            $vm->setVariables([
                'title' => "Suppression de l'inscription de [" . $inscrit->getAgent()->getDenomination() . "]",
                'title' => "Suppression de l'inscription de [" . $inscrit->getStagiaire()->getDenomination() . "]",
                'text' => "La suppression est définitive êtes-vous sûr&middot;e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('formation-instance/supprimer-agent', ["inscrit" => $inscrit->getId()], [], true),
                'action' => $this->url()->fromRoute('formation-instance/supprimer-stagiaire-externe', ["inscrit" => $inscrit->getId()], [], true),
            ]);
        }
        return $vm;
    }


    public function envoyerListePrincipaleAction() : Response
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
+8
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritControllerFactory.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ use Formation\Form\Inscription\InscriptionForm;
use Formation\Service\DemandeExterne\DemandeExterneService;
use Formation\Service\FormationInstance\FormationInstanceService;
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
use Formation\Service\InscriptionExterne\InscriptionExterneService;
use Formation\Service\Notification\NotificationService;
use Formation\Service\StagiaireExterne\StagiaireExterneService;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -37,10 +39,12 @@ class FormationInstanceInscritControllerFactory
         * @var EtatTypeService $etatTypeService
         * @var FormationInstanceService $formationInstanceService
         * @var FormationInstanceInscritService $formationInstanceInscritService
         * @var InscriptionExterneService $inscriptionExterneService
         * @var MailService $mailService
         * @var NotificationService $notificationService
         * @var ParametreService $parametreService
         * @var RenduService $renduService
         * @var StagiaireExterneService $stagiaireExterneService
         * @var UserService $userService
         */
        $agentService = $container->get(AgentService::class);
@@ -49,10 +53,12 @@ class FormationInstanceInscritControllerFactory
        $etatTypeService = $container->get(EtatTypeService::class);
        $formationInstanceService = $container->get(FormationInstanceService::class);
        $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class);
        $inscriptionExterneService = $container->get(InscriptionExterneService::class);
        $mailService = $container->get(MailService::class);
        $notificationService = $container->get(NotificationService::class);
        $parametreService = $container->get(ParametreService::class);
        $renduService = $container->get(RenduService::class);
        $stagiaireExterneService = $container->get(StagiaireExterneService::class);
        $userService = $container->get(UserService::class);

        /**
@@ -69,10 +75,12 @@ class FormationInstanceInscritControllerFactory
        $controller->setEtatTypeService($etatTypeService);
        $controller->setFormationInstanceService($formationInstanceService);
        $controller->setFormationInstanceInscritService($formationInstanceInscritService);
        $controller->setInscriptionExterneService($inscriptionExterneService);
        $controller->setMailService($mailService);
        $controller->setNotificationService($notificationService);
        $controller->setParametreService($parametreService);
        $controller->setRenduService($renduService);
        $controller->setStagiaireExterneService($stagiaireExterneService);
        $controller->setUserService($userService);
        $controller->setInscriptionForm($inscriptionForm);
        $controller->setSelectionAgentForm($selectionAgentForm);
+4
Changes for module/Formation/src/Formation/Controller/ImportationLagafControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use UnicaenEtat\Service\EtatInstance\EtatInstanceService;
use UnicaenUtilisateur\Service\User\UserService;

class ImportationLagafControllerFactory
{
@@ -39,6 +40,7 @@ class ImportationLagafControllerFactory
         * @var PresenceService $presenceService
         * @var HasFormationCollectionService $hasFormationCollectionService
         * @var StagiaireService $stagiaireService
         * @var UserService $userService
         */
        $etatInstanceService = $container->get(EtatInstanceService::class);
        $formationService = $container->get(FormationService::class);
@@ -50,6 +52,7 @@ class ImportationLagafControllerFactory
        $presenceService = $container->get(PresenceService::class);
        $hasFormationCollectionService = $container->get(HasFormationCollectionService::class);
        $stagiaireService = $container->get(StagiaireService::class);
        $userService = $container->get(UserService::class);

        $controller = new ImportationLagafController();
        $controller->setEtatInstanceService($etatInstanceService);
@@ -62,6 +65,7 @@ class ImportationLagafControllerFactory
        $controller->setPresenceService($presenceService);
        $controller->setHasFormationCollectionService($hasFormationCollectionService);
        $controller->setStagiaireService($stagiaireService);
        $controller->setUserService($userService);
        $controller->sourceLagaf = HasSourceInterface::SOURCE_LAGAF;
        return $controller;
    }
+23
Changes for module/Formation/src/Formation/Entity/Db/FormationInstance.php: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface,

    private Collection $journees;
    private Collection $inscrits;
    private Collection $externes;
    private Collection $formateurs;

    private ?SessionParametre $parametre = null;
@@ -54,7 +55,10 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface,
        $this->etats = new ArrayCollection();
        $this->journees = new ArrayCollection();
        $this->inscrits = new ArrayCollection();
        $this->externes = new ArrayCollection();

        $this->formateurs = new ArrayCollection();

    }
    /**
     * @return string
@@ -397,6 +401,25 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface,
        return false;
    }

    /** @return InscriptionExterne[] */
    public function getInscriptionsExternes(): array
    {
        return $this->externes->toArray();
    }

    /**
     * @param StagiaireExterne $stagiaire
     * @return bool
     */
    public function hasStagiaireExterne(StagiaireExterne $stagiaire) :  bool
    {
        /** @var InscriptionExterne $externe */
        foreach ($this->externes as $externe) {
            if ($externe->getStagiaire() === $stagiaire) return true;
        }
        return false;
    }

    /** COUT DE LA FORMATION *********************************************************************************/

    /**
Loading