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

[FIX] Correction du bug de comptage d'année si pas de thèse

parent 42b02db8

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Journal des modifications 
- [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 

- [FIX] Correction du bug de comptage d'année si pas de thèse



5.2.6

-----

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

+3 −2
Changes for module/Formation/src/Formation/Controller/SessionController.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -323,11 +323,12 @@ class SessionController extends AbstractController 
            $etablissements = array_map(function (These $t) { return ($t->getEtablissement())?$t->getEtablissement()->getStructure()->getLibelle():"Établissement non renseigné";}, $theses);

            $ecoles = array_map(function (These $t) { return ($t->getEcoleDoctorale())?$t->getEcoleDoctorale()->getStructure()->getLibelle():"École doctorale non renseignée";}, $theses);

            $unites = array_map(function (These $t) { return ($t->getUniteRecherche())?$t->getUniteRecherche()->getStructure()->getLibelle():"Unité de recherche non renseignée";}, $theses);

            $nbInscription = (!empty($theses))?current($theses)->getNbInscription($annee):"---";

            $entry = [

                'Liste' => $inscription->getListe(),

                'Dénomination étudiant' => $doctorant->getIndividu()->getNomComplet(),

                'Adresse électronique' => $doctorant->getIndividu()->getEmailPro(),

                'Année de thèse' => current($theses)->getNbInscription($annee),

                'Adresse électronique' => $doctorant->getIndividu()->getEmail(),

                'Année de thèse' => $nbInscription,

                'Établissement' => implode("/",$etablissements),

                'École doctorale' => implode("/",$ecoles),

                'Unité de recherche' => implode("/",$unites),

module/Structure/src/Structure/Entity/Db/Structure.php

+4 −1
Changes for module/Structure/src/Structure/Entity/Db/Structure.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -91,7 +91,10 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA 
     */

    private Collection $structuresSubstituees;



    private Collection $structureSubstituante;

    /**

     * @var ArrayCollection|Structure[]

     */

    private  $structureSubstituante;



    /** @var ArrayCollection StructureDocument */

    private $documents;

module/Structure/view/structure/etablissement/modifier.phtml

+1 −1
Changes for module/Structure/view/structure/etablissement/modifier.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ $form->get('code')->setAttribute('readonly', !$editable); 
        <?php

        $content = $logoContent;

        if ($content === null) {

            $form->getObject()->setCheminLogo(null);

            $form->getObject()->getStructure()->setCheminLogo(null);

        }

        ?>

        <table>