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

Fin avancée de la partie Stagiaire externe

parent 909b5747

module/Formation/config/merged/formation-instance-inscrit.config.php

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ return [ 
                'options' => [

                    'route' => '/mes-formations[/:agent]',

                    'defaults' => [

                        /** @see FormationInstanceInscritController::formationsAction() */

                        'controller' => FormationInstanceInscritController::class,

                        'action' => 'formations',

                    ],

module/Formation/config/merged/formation-instance.config.php

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ return [ 
                    'gestion-formation' => [

                        'pages' => [

                            'session_' => [

                                'label'    => 'Session en cours',

                                'label'    => 'Sessions en cours',

                                'route'    => 'formation-instance',

                                'resource' => PrivilegeController::getResourceId(FormationInstanceController::class, 'index') ,

                                'order'    => 230,

module/Formation/src/Formation/Controller/DemandeExterneController.php

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ class DemandeExterneController extends AbstractActionController { 
    public function parapheurAction() : ViewModel

    {

        $paramsInternes = [

            'etat' => $this->getEtatTypeService()->getEtatTypeByCode(InscriptionEtats::ETAT_VALIDER_RESPONSABLE),

            'etat' => InscriptionEtats::ETAT_VALIDER_RESPONSABLE,

            'historise' => '0',

            'annee' => Formation::getAnnee(),

        ];

module/Formation/src/Formation/Controller/EnqueteQuestionController.php

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class EnqueteQuestionController extends AbstractActionController 


        //todo exploiter le filtre pour réduire

        if ($session) $reponses = array_filter($reponses, function (EnqueteReponse $r) use ($session) {

            return $r->getInscription()->getInstance() === $session;

            return $r->getInscription()->getSession() === $session;

        });

        //todo fin

module/Formation/src/Formation/Controller/InscriptionController.php

+4 −4
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ class InscriptionController extends AbstractActionController 
        $inscription = $this->getInscriptionService()->getRequestedInscription($this);

        $instance = $inscription->getSession();



        $form = $this->getInscriptionForm();

        $form = $this->getJustificationForm();

        $form->setAttribute('action', $this->url()->fromRoute('formation/inscription/valider-responsable', ['inscription' => $inscription->getId()], [], true));

        $form->bind($inscription);
@@ -213,7 +213,7 @@ class InscriptionController extends AbstractActionController 
        $inscription = $this->getInscriptionService()->getRequestedInscription($this);

        $instance = $inscription->getSession();



        $form = $this->getInscriptionForm();

        $form = $this->getJustificationForm();

        $form->setAttribute('action', $this->url()->fromRoute('formation/inscription/refuser-responsable', ['inscription' => $inscription->getId()], [], true));

        $form->bind($inscription);
@@ -250,7 +250,7 @@ class InscriptionController extends AbstractActionController 
        $inscription = $this->getInscriptionService()->getRequestedInscription($this);

        $session = $inscription->getSession();



        $form = $this->getInscriptionForm();

        $form = $this->getJustificationForm();

        $form->setAttribute('action', $this->url()->fromRoute('formation/inscription/valider-drh', ['inscription' => $inscription->getId()], [], true));

        $form->bind($inscription);
@@ -285,7 +285,7 @@ class InscriptionController extends AbstractActionController 
        $inscription = $this->getInscriptionService()->getRequestedInscription($this);

        $instance = $inscription->getSession();



        $form = $this->getInscriptionForm();

        $form = $this->getJustificationForm();

        $form->setAttribute('action', $this->url()->fromRoute('formation/inscription/refuser-drh', ['inscription' => $inscription->getId()], [], true));

        $form->bind($inscription);