Commit c47f7e2c authored by Thomas Hamel's avatar Thomas Hamel
Browse files

affichage des ED non fermées, chgt de Soutenances à venir à Soutenances... 

affichage des ED non fermées, chgt de Soutenances à venir à Soutenances actuelles, affichage des soutenances jusqu'à 1 an après leur date
parent f1e7054d

module/Application/src/Application/Controller/SoutenanceController.php

+1 −0
Changes for module/Application/src/Application/Controller/SoutenanceController.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ class SoutenanceController extends AbstractController 
                ->join('ed.structure', 's')

                ->andWhereNotHistorise('ed')

                ->andWhereNotHistorise('s')

                ->andWhere("s.estFermee = false")

                ->orderBy('s.sigle');

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

        }

module/Application/view/application/soutenance/index.phtml

+2 −2
Changes for module/Application/view/application/soutenance/index.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ echo $this->messenger() 


    <div id="content" class="col-12 col-md-10">

        <h1 class="page-header">

            Soutenances à venir

            Soutenances actuelles

        </h1>



        <p class="lead">

            Ci-dessous sont listées les soutenances à venir par école doctorale

            Ci-dessous sont listées les soutenances actuelles par école doctorale

        </p>



        <?php if($ecoles !== null) : ?>

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

+6 −2
Changes for module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -600,10 +600,14 @@ class PropositionService extends BaseService 
     */

    public function findSoutenancesAutoriseesByEcoleDoctorale(EcoleDoctorale $ecole) : array

    {

        $qb = $this->createQueryBuilder()

        $qb = $this->getRepository()->createQueryBuilder("proposition")

            ->addSelect('etat')->join('proposition.etat', 'etat')

            ->addSelect('these')->join('proposition.these', 'these')

            ->addSelect('ecole')->leftJoin('these.ecoleDoctorale', 'ecole')

            ->addSelect('structure_ed')->leftJoin('ecole.structure', 'structure_ed')

            ->andWhereStructureIs($ecole->getStructure(), 'structure_ed')

            ->andWhere('etat.code = :autorise')

            ->andWhere('these.dateSoutenance >= :date')

            ->andWhere('DATE_ADD(these.dateSoutenance, 1, \'YEAR\') > :date')

            ->setParameter('autorise', Etat::VALIDEE)

            ->setParameter('date', new DateTime())

            ->orderBy('these.dateSoutenance', 'ASC');

module/Soutenance/view/soutenance/proposition/afficher-soutenances-par-ecole-doctorale.phtml

+2 −2
Changes for module/Soutenance/view/soutenance/proposition/afficher-soutenances-par-ecole-doctorale.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ $count = count($soutenances); 
        </h1>



        <?php if ($count > 0) : ?>

    <h2>Liste des soutenances à venir <span class="badge"><?php echo $count; ?> </span></h2>

    <h2>Liste des soutenances actuelles <span class="badge"><?php echo $count; ?> </span></h2>

    <?php foreach ($soutenances as $soutenance) : ?>



        <?php
@@ -128,7 +128,7 @@ $count = count($soutenances); 
        </div>

    <?php endforeach; ?>

<?php else: ?>

    <p class="lead">Aucune soutenance à venir</p>

    <p class="lead">Aucune soutenance actuellement</p>

<?php endif; ?>

    </div>

</div>