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

Correction boucle these 24644

parent ff99976f

module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php

+4 −1
Changes for module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ class PropositionService { 
            ->addSelect('structure_ed')->leftJoin('ecole.structure', 'structure_ed')

            ->addSelect('etablissement')->leftJoin('these.etablissement', 'etablissement')

            ->addSelect('structure_etab')->leftJoin('etablissement.structure', 'structure_etab')

            ->addSelect('membre')->join('proposition.membres', 'membre')

            ->addSelect('membre')->leftJoin('proposition.membres', 'membre')

            ->addSelect('qualite')->leftJoin('membre.qualite', 'qualite')

            ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur')

            ->addSelect('justificatif')->leftJoin('proposition.justificatifs', 'justificatif')
@@ -233,6 +233,9 @@ class PropositionService { 
            ->andWhere("proposition.these = :these")

            ->setParameter("these", $these)

        ;

//        $qb = $this->getEntityManager()->getRepository(Proposition::class)->createQueryBuilder('proposition')

//            ->andWhere("proposition.these = :these")

//            ->setParameter("these", $these);

        try {

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

        } catch (NonUniqueResultException $e) {

module/Soutenance/view/soutenance/proposition/partial/validations-structures.phtml

+9 −1
Changes for module/Soutenance/view/soutenance/proposition/partial/validations-structures.phtml: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,15 @@ $these = $proposition->getThese(); 
                        <?php endif; ?>

                    </li>

                    <li>

                        <?php echo $these->getEcoleDoctorale()->getLibelle(); ?>  (École doctorale) <br/>

                        <?php if ($these->getEcoleDoctorale()) : ?>

                            <?php echo $these->getEcoleDoctorale()->getLibelle(); ?>  (École Doctorale) <br/>

                        <?php else: ?>

                            <strong style="color:darkred;">

                                Aucune

                                (École Doctorale)

                            </strong>

                            <br/>

                        <?php endif; ?>

                        <?php if ($validations[Role::CODE_RESP_ED]) : ?>

                            <?php $validation = current($validations[Role::CODE_RESP_ED]); ?>

                            <span class="badge badge-success"> Validée</span>