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

Amélioration de l'index doctorant du module formation

parent 0d743cdd

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Journal des modifications 
- Ajout d'une date de fermeture (indicative) pour les sessions de formation

- Dépôts de nouveaux fichiers divers : charte du doctorat et convention de formation doctorale.

- Extraction d'un module Depot (dépôt du manuscrit de thèse).

- Amélioration de l'index doctorant du module formation

- [FIX] Retrait de la liste complémentaire du mail d'echec

- [FIX] Ordonnancement des séances sur les index des formations et des sessions 

- [FIX] Correction paramètre de route erronée + suppression bouton inactif

module/Formation/config/others/session.config.php

+20 −0
Original line number Diff line number Diff line
@@ -46,6 +46,15 @@ return [ 
                        SessionPrivileges::SESSION_AFFICHER,

                    ],

                ],

                [

                    'controller' => SessionController::class,

                    'action' => [

                        'afficher-fiche',

                    ],

                    'roles' => [

                        'user',

                    ],

                ],

                [

                    'controller' => SessionController::class,

                    'action' => [
@@ -159,6 +168,17 @@ return [ 
                                    ],

                                ],

                            ],

                            'afficher-fiche' => [

                                'type'  => Segment::class,

                                'may_terminate' => true,

                                'options' => [

                                    'route'    => '/afficher-fiche/:session',

                                    'defaults' => [

                                        'controller' => SessionController::class,

                                        'action'     => 'afficher-fiche',

                                    ],

                                ],

                            ],

                            'generer-export' => [

                                'type'  => Segment::class,

                                'may_terminate' => true,

module/Formation/src/Formation/Controller/SessionController.php

+9 −0
Original line number Diff line number Diff line
@@ -70,6 +70,15 @@ class SessionController extends AbstractController 
        ]);

    }



    public function afficherFicheAction() : ViewModel

    {

        $session = $this->getSessionService()->getRepository()->getRequestedSession($this);

        return new ViewModel([

            'title' => "Information sur la session #".$session->getIndex(). " - ". $session->getFormation()->getLibelle(),

            'session' => $session,

        ]);

    }



    public function ajouterAction() : ViewModel

    {

        $formation = $this->getFormationService()->getRepository()->getRequestedFormation($this);

module/Formation/src/Formation/Entity/Db/Repository/InscriptionRepository.php

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ class InscriptionRepository extends EntityRepository 
            ->setParameter('doctorant', $doctorant)

        ;

        $result = $qb->getQuery()->getResult();



        usort($result, function (Inscription $a, Inscription $b) { return $a->getSession()->getDateDebut() > $b->getSession()->getDateDebut();});

        return $result;

    }

module/Formation/src/Formation/Entity/Db/Repository/SessionRepository.php

+4 −1
Original line number Diff line number Diff line
@@ -86,7 +86,10 @@ class SessionRepository extends DefaultEntityRepository 
            ->setParameter('preparation', Etat::CODE_PREPARATION)

        ;



        return $qb->getQuery()->getResult();

        $result =  $qb->getQuery()->getResult();

        usort($result, function (Session $a, Session $b) { return $a->getDateDebut(true) > $b->getDateDebut(true);});



        return $result;

    }



    /**