Commit 7f6e6ba5 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Modifications UI

parent 3084c0a2

module/Formation/src/Formation/View/Helper/partial/inscription.phtml

+3 −5
Changes for module/Formation/src/Formation/View/Helper/partial/inscription.phtml: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -57,13 +57,11 @@ $these = current($doctorant->getTheses()); 
                    <?php foreach ($doctorant->getTheses() as $these) {

                        if ($these->getEtatThese() === These::ETAT_EN_COURS and $these->estNonHistorise()) {

                            echo "<br/>";

                            echo $this->site($these->getEtablissement());

                            echo $this->structure($these->getEtablissement(), false, true);

                            echo " - ";

                            echo $this->site($these->getEcoleDoctorale());

                            echo $this->structure($these->getEcoleDoctorale(), false, true);

                            echo " - ";

                            echo $this->site($these->getUniteRecherche());

                            echo " - ";

                            echo "D" . $these->getAnneesUnivInscriptionCount(AnneeUniv::fromPremiereAnnee($annee->getPremiereAnnee()));

                            echo $this->structure($these->getUniteRecherche(), false, true);

                        }

                        $missions = $doctorant->getMissionsEnseignements();

                        if (!empty($missions)) {

module/Structure/src/Structure/View/Helper/StructureViewHelper.php

+3 −2
Changes for module/Structure/src/Structure/View/Helper/StructureViewHelper.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ use Structure\Entity\Db\UniteRecherche; 


class StructureViewHelper extends AbstractHelper

{

    public function __invoke(Structure|Etablissement|EcoleDoctorale|UniteRecherche $structure = null, bool $afficherLibelle = true): string

    public function __invoke(Structure|Etablissement|EcoleDoctorale|UniteRecherche $structure = null, bool $afficherLibelle = true, bool $sansOmbre = false): string

    {

        /** @var PhpRenderer $view */

        $view = $this->getView();
@@ -41,7 +41,8 @@ class StructureViewHelper extends AbstractHelper 
            'typeStructureClass' => $typeStructureClass,

            'structureLibelle' => $structureLibelle,

            'structureCode' => $structureCode,

            'afficherLibelle' => $afficherLibelle

            'afficherLibelle' => $afficherLibelle,

            'sansOmbre' => $sansOmbre

        ]);

    }

}
 
 No newline at end of file

module/Structure/src/Structure/View/Helper/partial/structure.phtml

+2 −1
Changes for module/Structure/src/Structure/View/Helper/partial/structure.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,11 +5,12 @@ 
 * @var string $structureLibelle

 * @var string $structureCode

 * @var bool $afficherLibelle

 * @var bool $sansOmbre

 **/



?>



<span class="text-structure <?= $typeStructureClass ?>" style="padding: 4px 4px 5px 0; background-color:white;"

<span class="text-structure <?= $typeStructureClass ?>" style="padding: 4px 4px 5px 0; background-color:white; <?php echo $sansOmbre ? "box-shadow:unset;" : ""; ?>"

      data-bs-toggle="tooltip" data-bs-original-title="<?php echo $afficherLibelle ? "" : $structureLibelle ?>">

    <?php echo $afficherLibelle ? $structureLibelle : $structureCode ?>

</span>
 
 No newline at end of file

public/css/app.css

+3 −0
Changes for public/css/app.css: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1129,6 +1129,9 @@ p.avis-complem { 
  text-decoration: line-through;

  /* Nom barré pour signaler l'historisation */ }



.doctorant-card.historise .text-structure {

  background-color: unset !important; }



td > a + a {

  margin-left: 4px;

  /* Ajoute de l'espace entre les <a> */ }

public/css/app.scss

+4 −0
Changes for public/css/app.scss: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1657,6 +1657,10 @@ p.avis-complem { 
  text-decoration: line-through; /* Nom barré pour signaler l'historisation */

}



.doctorant-card.historise .text-structure {

  background-color: unset!important;

}



td > a + a {

  margin-left: 4px; /* Ajoute de l'espace entre les <a> */

}