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

Décallage des inscrits dans la partie formation

parent d5b54418

module/Application/config/merged/formation.config.php

+0 −70
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ use Application\Service\Formation\FormationService; 
use Application\Service\Formation\FormationServiceFactory;

use Application\Service\Formation\FormationThemeService;

use Application\Service\Formation\FormationThemeServiceFactory;

use Application\Service\FormationInstance\FormationInstanceInscritService;

use Application\Service\FormationInstance\FormationInstanceInscritServiceFactory;

use Application\Service\FormationInstance\FormationInstanceService;

use Application\Service\FormationInstance\FormationInstanceServiceFactory;

use UnicaenPrivilege\Guard\PrivilegeController;
@@ -160,13 +158,6 @@ return [ 
                    'action' => [

                        'modifier-informations',



                        'ajouter-agent',

                        'historiser-agent',

                        'restaurer-agent',

                        'supprimer-agent',

                        'envoyer-liste-principale',

                        'envoyer-liste-complementaire',



                        'export-emargement',

                        'export-tous-emargements',
@@ -340,66 +331,6 @@ return [ 
                            ],

                        ],

                    ],

                    'ajouter-agent' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/ajouter-agent/:formation-instance',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'ajouter-agent',

                            ],

                        ],

                    ],

                    'historiser-agent' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/historiser-agent/:inscrit',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'historiser-agent',

                            ],

                        ],

                    ],

                    'restaurer-agent' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/restaurer-agent/:inscrit',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'restaurer-agent',

                            ],

                        ],

                    ],

                    'supprimer-agent' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/supprimer-agent/:inscrit',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'supprimer-agent',

                            ],

                        ],

                    ],

                    'envoyer-liste-principale' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/envoyer-liste-principale/:inscrit',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'envoyer-liste-principale',

                            ],

                        ],

                    ],

                    'envoyer-liste-complementaire' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/envoyer-liste-complementaire/:inscrit',

                            'defaults' => [

                                'controller' => FormationInstanceController::class,

                                'action'     => 'envoyer-liste-complementaire',

                            ],

                        ],

                    ],

                ],

            ],

            'formation-theme' => [
@@ -636,7 +567,6 @@ return [ 
        'factories' => [

            FormationService::class => FormationServiceFactory::class,

            FormationInstanceService::class => FormationInstanceServiceFactory::class,

            FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,

            FormationGroupeService::class => FormationGroupeServiceFactory::class,

            FormationThemeService::class => FormationThemeServiceFactory::class,

            FormationInstanceInscritAssertion::class => FormationInstanceInscritAssertionFactory::class,

module/Application/src/Application/Assertion/FormationInstanceInscritAssertion.php

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ namespace Application\Assertion; 


use Application\Constant\RoleConstant;

use Application\Entity\Db\Agent;

use Application\Entity\Db\FormationInstanceInscrit;

use Formation\Entity\Db\FormationInstanceInscrit;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\FormationPrivileges;

use Application\Service\Structure\StructureServiceAwareTrait;

module/Application/src/Application/Controller/FormationInstanceController.php

+1 −113
Original line number Diff line number Diff line
@@ -3,14 +3,13 @@ 
namespace Application\Controller;



use Application\Entity\Db\FormationInstance;

use Application\Entity\Db\FormationInstanceInscrit;

use Formation\Entity\Db\FormationInstanceJournee;

use Application\Form\FormationInstance\FormationInstanceFormAwareTrait;

use Formation\Form\FormationJournee\FormationJourneeFormAwareTrait;

use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;

use Application\Service\Export\Formation\Emargement\EmargementPdfExporter;

use Application\Service\Formation\FormationServiceAwareTrait;

use Application\Service\FormationInstance\FormationInstanceInscritServiceAwareTrait;

use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;

use Application\Service\FormationInstance\FormationInstanceServiceAwareTrait;

use Autoform\Service\Formulaire\FormulaireInstanceServiceAwareTrait;

use Formation\Service\FormationInstanceFormateur\FormationInstanceFormateurServiceAwareTrait;
@@ -177,117 +176,6 @@ class FormationInstanceController extends AbstractActionController { 
        exit;

    }



    /** INSCRIT ********************************************************************************************/



    public function ajouterAgentAction()

    {

        $instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);



        $inscrit = new FormationInstanceInscrit();

        $inscrit->setInstance($instance);



        $form = $this->getSelectionAgentForm();

        $form->setAttribute('action', $this->url()->fromRoute('formation-instance/ajouter-agent', ['formulaire-instance' => $instance->getId()], [], true));

        $form->bind($inscrit);



        $request = $this->getRequest();

        if ($request->isPost()) {

            $data = $request->getPost();

            $form->setData($data);



            if ($form->isValid()) {

                if (! $instance->hasAgent($inscrit->getAgent())) {

                    $inscrit->setListe($instance->getListeDisponible());

                    $this->getFormationInstanceInscritService()->create($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>.");

                } else {

                    $this->flashMessenger()->addErrorMessage("L'agent <strong>" . $inscrit->getAgent()->getDenomination() . "</strong> est déjà inscrit&middot;e à l'instance de formation.");

                }

            }

        }



        $vm = new ViewModel();

        $vm->setTemplate('application/default/default-form');

        $vm->setVariables([

            'title' => "Ajout d'un agent pour l'instance de formation",

            'form' => $form,

        ]);

        return $vm;

    }



    public function historiserAgentAction()

    {

        $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()

    {

        $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()

    {

        $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();

        if ($inscrit !== null) {

            $vm->setTemplate('application/default/confirmation');

            $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 envoyerListePrincipaleAction()

    {

        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);



        $inscrit->setListe(FormationInstanceInscrit::PRINCIPALE);

        $this->getFormationInstanceInscritService()->update($inscrit);



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



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

    }



    public function envoyerListeComplementaireAction()

    {

        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);



        $inscrit->setListe(FormationInstanceInscrit::COMPLEMENTAIRE);

        $this->getFormationInstanceInscritService()->update($inscrit);



        $this->flashMessenger()->addSuccessMessage("L'agent <strong>". $inscrit->getAgent()->getDenomination() ."</strong> vient d'être ajouté&middot;e en liste complémentaire.");



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

    }



    /**

     * @throws MpdfException

     */

module/Application/src/Application/Controller/FormationInstanceControllerFactory.php

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Application\Form\FormationInstance\FormationInstanceForm; 
use Formation\Form\FormationJournee\FormationJourneeForm;

use Application\Form\SelectionAgent\SelectionAgentForm;

use Application\Service\Formation\FormationService;

use Application\Service\FormationInstance\FormationInstanceInscritService;

use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;

use Application\Service\FormationInstance\FormationInstanceService;

use Autoform\Service\Formulaire\FormulaireInstanceService;

use Formation\Service\FormationInstanceJournee\FormationInstanceJourneeService;

module/Application/src/Application/Entity/Db/FormationInstance.php

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Entity\Db; 
use DateTime;

use Doctrine\Common\Collections\ArrayCollection;

use Formation\Entity\Db\FormationInstanceFormateur;

use Formation\Entity\Db\FormationInstanceInscrit;

use Formation\Entity\Db\FormationInstanceJournee;

use UnicaenEtat\Entity\Db\Etat;

use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;