Commit ec96a80b authored by Johnny Leveneur's avatar Johnny Leveneur
Browse files

modification de la page atelier etudiant

parent 6f4ebb36

module/Atelier/src/Entity/Db/Session.php

+10 −0
Original line number Diff line number Diff line
@@ -621,5 +621,15 @@ class Session implements HistoriqueAwareInterface, HasEtatsInterface, HasEveneme 
        return false;

    }



    public function getStringLieuSite(): string

    {

        $lieu = $this->getLieu() ?? '';

        $site = $this->getSite() ? $this->getSite()->getLibelle() : '';

        if ($lieu && $site) {

            return $lieu . ' (' . $site . ')';

        }

        return $lieu . $site;

    }





}
 
 No newline at end of file

module/Atelier/view/atelier/atelier/fiche.phtml

+7 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



use Atelier\Entity\Db\Atelier;

use Atelier\Entity\Db\Inscription;

use Atelier\Entity\Db\Seance;

use Atelier\Entity\Db\Session;

use Atelier\Provider\Etat\SessionEtats;
@@ -26,8 +27,8 @@ use Etudiant\Entity\Db\Etudiant; 
<table class="table table-condensed">

    <thead>

    <tr>

        <th> Identifiant</th>

        <th> Séances et volumes</th>

        <th> Lieu </th>

        <th> Informations sur la session</th>

        <th> Action</th>

    </tr>
@@ -35,7 +36,6 @@ use Etudiant\Entity\Db\Etudiant; 
    <tbody>

    <?php foreach ($sessions as $session): ?>

        <tr>

            <td data-column-id="id"> <?php echo $session->getId(); ?> </td>

            <td data-column-id="seances">

                <?php echo $session->getPeriode(); ?>

                <ul>
@@ -56,11 +56,15 @@ use Etudiant\Entity\Db\Etudiant; 
                    <?php endforeach; ?>

                </ul>

            </td>

            <td data-column-id="lieu">

                <?php echo $session->getStringLieuSite() ?>

            </td>

            <td data-column-id="informations">

                <?php if ($session->getComplement()):?>

                    <strong>Complément : </strong> <?php echo $session->getComplement(); ?>

                <?php endif; ?>

                <strong>Taille de la liste principale : </strong> <?php echo $session->getNbPlacePrincipale(); ?> <br>

                <strong>Taille de la liste principale : </strong>

                <?php echo $session->getPlaceDisponible(Inscription::PRINCIPALE) . '/' . $session->getNbPlacePrincipale(); ?> <br>

            </td>

            <td data-column-id="action">

                <?php if ($session->isEtatActif(SessionEtats::ETAT_INSCRIPTION_OUVERTE)) : ?>