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

Merge branch 'develop' into release_3.0.2

parents 501b5580 a465ad02

module/Application/config/others/co-encadrant.config.php

+8 −8
Changes for module/Application/config/others/co-encadrant.config.php: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ return [ 
                    'historique' => [

                        'type'          => Segment::class,

                        'options'       => [

                            'route'    => '/historique/:co-encadrant',

                            'route'    => '/historique[/:co-encadrant]',

                            'defaults' => [

                                'controller'    => CoEncadrantController::class,

                                'action'        => 'historique',
@@ -134,13 +134,13 @@ return [ 
                                'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'index'),



                                'order'    => 300,

                                'pages' => [

                                    'historique' => [

                                        'label'    => 'Historique',

                                        'route'    => 'co-encadrant/historique',

                                        'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'historique'),

                                    ],

                                ],

//                                'pages' => [

//                                    'historique' => [

//                                        'label'    => 'Historique',

//                                        'route'    => 'co-encadrant/historique',

//                                        'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'historique'),

//                                    ],

//                                ],

                            ],

                        ],

                    ],

module/Application/src/Application/Controller/CoEncadrantController.php

+4 −0
Changes for module/Application/src/Application/Controller/CoEncadrantController.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ class CoEncadrantController extends AbstractActionController { 
    public function historiqueAction()

    {

        $coencadrant = $this->getCoEncadrantService()->getRequestedCoEncadrant($this);

        if ($coencadrant === null) {

            return $this->redirect()->toRoute('co-encadrant', [], [], true);

        }



        $theses = $this->getTheseService()->getRepository()->fetchThesesByCoEncadrant($coencadrant->getIndividu());



        $encours = []; $closes = [];

module/Application/src/Application/Entity/Db/Repository/ValidationRepository.php

+3 −3
Changes for module/Application/src/Application/Entity/Db/Repository/ValidationRepository.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ class ValidationRepository extends DefaultEntityRepository 
     * @param These $these

     * @param string $code

     * @param Individu $individu

     * @return Validation[]

     * @return Validation|null

     */

    public function findValidationByTheseAndCodeAndIndividu(These $these, string $code, Individu $individu) : array

    public function findValidationByTheseAndCodeAndIndividu(These $these, string $code, Individu $individu) : ?Validation

    {

        $qb = $this->createQueryBuilder('v')

            ->where('tv.code = :code')
@@ -52,7 +52,7 @@ class ValidationRepository extends DefaultEntityRepository 
            ->setParameter('these', $these)

        ;



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

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

    }



    /**

module/Application/src/Application/Service/CoEncadrant/CoEncadrantService.php

+7 −5
Changes for module/Application/src/Application/Service/CoEncadrant/CoEncadrantService.php: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -43,11 +43,13 @@ class CoEncadrantService { 
    }



    /**

     * @param int $id

     * @return Acteur

     * @param int|null $id

     * @return Acteur|null

     */

    public function getCoEncadrant(int $id)

    public function getCoEncadrant(?int $id) : ?Acteur

    {

        if ($id === null) return null;



        $qb = $this->createQueryBuilder()

            ->andWhere('acteur.id = :id')

            ->setParameter('id', $id)
@@ -63,9 +65,9 @@ class CoEncadrantService { 
    /**

     * @param AbstractActionController $controller

     * @param string $param

     * @return Acteur

     * @return ?Acteur

     */

    public function getRequestedCoEncadrant(AbstractActionController $controller, string $param = 'co-encadrant')

    public function getRequestedCoEncadrant(AbstractActionController $controller, string $param = 'co-encadrant') : ?Acteur

    {

        $id = $controller->params()->fromRoute($param);

        $result = $this->getCoEncadrant($id);

module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php

+3 −3
Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -267,9 +267,9 @@ class PresoutenanceController extends AbstractController 
        $membre->setActeur(null);

        $this->getMembreService()->update($membre);



        $validations = $this->getValidationService()->getRepository()->findValidationByTheseAndCodeAndIndividu($these, TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $acteur->getIndividu());

        if (!empty($validations)) {

            $this->getValidationService()->unsignEngagementImpartialite(current($validations));

        $validation = $this->getValidationService()->getRepository()->findValidationByTheseAndCodeAndIndividu($these, TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $acteur->getIndividu());

        if ($validation !== null) {

            $this->getValidationService()->unsignEngagementImpartialite($validation);

        }



        $utilisateur = $this->utilisateurService->getRepository()->findByUsername($username);