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

Merge branch 'hotfix_libelle_ur'

parents 7c8b1967 61c01353

module/Soutenance/view/soutenance/index/index-structure.phtml

+8 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
use Application\Entity\Db\EcoleDoctorale;

use Application\Entity\Db\Etablissement;

use Application\Entity\Db\Role;

use Application\Entity\Db\These;

use Application\Entity\Db\UniteRecherche;

use Application\Provider\Privilege\ThesePrivileges;

use Soutenance\Entity\Proposition;
@@ -59,6 +60,11 @@ $canSuppression = ($role->getCode() === Role::CODE_ADMIN_TECH); 
    </thead>

    <tbody>

        <?php foreach ($propositions as $proposition) : ?>

            <?php

                /** @var These $these **/

                $these = $proposition->getThese();

                $unite = $these->getUniteRecherche();

            ?>

            <tr>

                <td>

                    <?php if ($canVoirThese) : ?>
@@ -91,9 +97,9 @@ $canSuppression = ($role->getCode() === Role::CODE_ADMIN_TECH); 
                        <?php echo $proposition->getThese()->getEcoleDoctorale()->getLibelle(); ?>

                    </span> <br/>

                    <span class="structure unite-recherche"

                          title="Unité de recherche : <?php echo $proposition->getThese()->getUniteRecherche()->getLibelle(); ?> (<?php echo $proposition->getThese()->getUniteRecherche()->getSigle(); ?>)"

                          title="Unité de recherche : <?php echo ($unite)?$unite->getLibelle():$these->getLibelleUniteRecherche(); ?> <?php echo ($unite)?"(".$unite->getSigle() .")":""; ?>"

                    >

                        <?php echo $proposition->getThese()->getUniteRecherche()->getLibelle(); ?>

                        <?php echo ($unite)?$unite->getLibelle():"<span style='background:lightsalmon;'><strong>".$these->getLibelleUniteRecherche()."</strong></span>"; ?>

                    </span>

                </td>

                <td>