Commit 7915f3ef authored by Johnny Leveneur's avatar Johnny Leveneur
Browse files

liste étudiant : affichage des ia en cours

parent 47f3c4ae

module/Etudiant/src/Controller/EtudiantController.php

+5 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Etudiant\Controller;



use Etudiant\Entity\Db\Etudiant;

use Etudiant\Service\AnneeUnivIA\AnneeUnivIAServiceAwareTrait;

use Etudiant\Service\ComposanteIA\ComposanteIAServiceAwareTrait;

use Etudiant\Service\CycleIA\CycleIAServiceAwareTrait;
@@ -72,6 +73,8 @@ class EtudiantController extends AbstractActionController 
        if ($paramsEtudiantsIA !== null) {

            $etudiants = $this->getEtudiantService()->getEtudiantsWithFiltre($paramsEtudiantsIA);

        }

        $options = [ 'isAnneeEnCours' => true ];



        return new ViewModel([

            'etudiants' => $etudiants,

            'params' => $params,
@@ -79,6 +82,7 @@ class EtudiantController extends AbstractActionController 
            'etablissementIAasOptions' => $etablissementIAasOptions,

            'composanteIAasOptions' => $composanteIAasOptions,

            'cycleIAasOptions' => $cycleIAasOptions,

            'options' => $options,

        ]);

    }

module/Etudiant/src/Entity/Db/Etudiant.php

+6 −2
Original line number Diff line number Diff line
@@ -121,9 +121,13 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface 
        return $this->inscriptions;

    }



    public function getInscriptionsAdministratives(): Collection

    public function getInscriptionsAdministratives(bool $isAnneeEnCours = false ): Collection

    {

        return $this->inscriptionsAdministratives;

        if (!$isAnneeEnCours) return $this->inscriptionsAdministratives;

        $annee = Etudiant::getAnneeDate();

        $inscriptions = $this->getInscriptionAdministrativeByAnnee($annee);

        return $inscriptions;



    }



    public function getInscriptionAdministrativeByAnnee(int $annee): Collection

module/Etudiant/src/Service/AnneeUnivIA/AnneeUnivIAService.php

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ class AnneeUnivIAService 
        return $result;

    }



    public function getAnneeUnivIAByAnneeUniv(string $anneeUniv): ?AnneeUnivIA

    {

        $qb = $this->createQueryBuilder()

            ->andWhere('anneeUnivIA.anneeUniv = :anneeUniv')

            ->setParameter('anneeUniv', $anneeUniv);

        try {

            $result = $qb->getQuery()->getOneOrNullResult();

        } catch (NonUniqueResultException $e) {

            throw new RuntimeException("Plusieurs AnneeUnivIA partagent la même anneeUniv [" . $anneeUniv . "]", 0, $e);

        }



        return $result;

    }



    public function getRequestedAnneeUnivIA(AbstractActionController $controller, string $param = 'annee-univ-ia'): ?AnneeUnivIA

    {

        $id = $controller->params()->fromRoute($param);

module/Etudiant/src/View/Helper/EtudiantInscriptionsAdministrativesViewHelper.php

+2 −2
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ use Laminas\View\Resolver\TemplatePathStack; 
class EtudiantInscriptionsAdministrativesViewHelper extends AbstractHelper

{



    public function __invoke(Etudiant $etudiant): Partial|string

    public function __invoke(Etudiant $etudiant, ?bool $isAnneeEnCours = false): Partial|string

    {

        /** @var PhpRenderer $view */

        $view = $this->getView();

        $view->resolver()->attach(new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]]));



        return $view->partial('etudiant-inscriptions-administratives', ['etudiant' => $etudiant]);

        return $view->partial('etudiant-inscriptions-administratives', ['etudiant' => $etudiant, 'isAnneeEnCours' => $isAnneeEnCours]);

    }

}
 
 No newline at end of file

module/Etudiant/src/View/Helper/partial/etudiant-inscriptions-administratives.phtml

+3 −1
Original line number Diff line number Diff line
@@ -6,12 +6,14 @@ use Etudiant\Entity\Db\InscriptionAdministrative; 
/**

 * @see \Etudiant\View\Helper\EtudiantsViewHelper

 * @var Etudiant $etudiant

 * @var bool $isAnneeEnCours

 */



if(!isset($isAnneeEnCours)) $isAnneeEnCours = false ;

?>



<?php

$inscriptionsAdministratives = $etudiant->getInscriptionsAdministratives();

$inscriptionsAdministratives = $etudiant->getInscriptionsAdministratives($isAnneeEnCours);

if ($inscriptionsAdministratives) {

    echo '<ul>';

    foreach ($inscriptionsAdministratives as $inscriptionAdministrative) {