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

Grade supplémentaire liée à l'absence d'unité de recherche

parent a31c8427

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

+42 −15
Original line number Diff line number Diff line
@@ -86,21 +86,48 @@ $canSuppression = ($role->getCode() === Role::CODE_ADMIN_TECH); 
                    <?php endforeach; ?>

                </td>

                <td>

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

                        <span class="structure etablissement"

                          title="Établissement : <?php echo $proposition->getThese()->getEtablissement()->getLibelle(); ?> (<?php echo $proposition->getThese()->getEtablissement()->getCode(); ?>)"

                              title="Établissement : <?php echo $these->getEtablissement()->getLibelle(); ?> (<?php echo $these->getEtablissement()->getCode(); ?>)"

                        >

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

                    </span> <br/>

                            <?php echo $these->getEtablissement()->getLibelle(); ?>

                        </span>

                    <?php else : ?>

                        <strong style="color:darkred;">

                            Établissement  : Aucun

                        </strong>

                    <?php endif; ?>

                    <br/>



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

                        <span class="structure ecole-doctorale"

                          title="École doctorale : <?php echo $proposition->getThese()->getEcoleDoctorale()->getLibelle(); ?> (<?php echo $proposition->getThese()->getEcoleDoctorale()->getSigle(); ?>)"

                              title="École doctorale : <?php echo $these->getEcoleDoctorale()->getLibelle(); ?> <?php echo "(".$these->getEcoleDoctorale()->getSigle() .")"; ?>"

                        >

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

                    </span> <br/>

                            <?php echo $these->getEcoleDoctorale()->getLibelle(); ?>

                        </span>

                    <?php else : ?>

                        <strong style="color:darkred;">

                            École doctorale  : Aucune

                        </strong>

                    <?php endif; ?>

                    <br/>



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

                        <span class="structure unite-recherche"

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

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

                        >

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

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

                        </span>

                    <?php else : ?>

                        <strong style="color:darkred;">

                            Unité de recherche :

                            <?php if ($these->getLibelleUniteRecherche() === null) : ?>

                                Aucune

                            <?php else : ?>

                                <?php echo $these->getLibelleUniteRecherche(); ?>

                            <?php endif; ?>

                        </strong>

                    <?php endif; ?>

                </td>

                <td>

                    <span class="badge <?php echo $proposition->getEtat()->getCode(); ?>">

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

+14 −1
Original line number Diff line number Diff line
@@ -26,7 +26,20 @@ $these = $proposition->getThese(); 
                </h4>

                <ul>

                    <li>

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

                            <?php echo $these->getUniteRecherche()->getLibelle(); ?>  (Unité de recherche) <br/>

                        <?php else: ?>

                            <strong style="color:darkred;">

                                Libellé complémentaire :

                                <?php if ($these->getLibelleUniteRecherche() === null) : ?>

                                    Aucun

                                <?php else : ?>

                                    <?php echo $these->getLibelleUniteRecherche(); ?>

                                <?php endif; ?>

                                (Unité de recherche)

                            </strong>

                            <br/>

                        <?php endif; ?>

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

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

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