Commit 749f0737 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'cherry-pick-c4ba067b' into 'b17' 

Oarcours des chemins pédagogiques pour calculer le nb d'éléments présents dans les étapes

See merge request open-source/OSE!103
parents 48e563fb 4fc1349c

module/Application/src/Application/Controller/OffreFormationController.php

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


namespace Application\Controller;



use Application\Entity\Db\CheminPedagogique;

use Application\Entity\Db\ElementPedagogique;

use Application\Entity\Db\Etape;

use Application\Entity\Db\GroupeTypeFormation;
@@ -365,6 +366,7 @@ class OffreFormationController extends AbstractController 
        /* Mise en place des filtres */

        $this->em()->getFilters()->enable('historique')->init([

            ElementPedagogique::class,

            CheminPedagogique::class,

            TypeFormation::class,

            GroupeTypeFormation::class,

            TypeModulateur::class,

module/Application/view/application/offre-formation/index.phtml

+2 −2
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ $etapesItems = [ 


foreach ($etapes as $etp) {

    $etapesItems[$etp->getId()] = [

        'label'     => sprintf("%s (%s EP)", $etp, count($etp->getElementPedagogique())),

        'label'     => sprintf("%s (%s EP)", $etp, count($etp->getCheminPedagogique())),

        'etape'     => $etp,

        'orpheline' => $etp->getElementPedagogique()->count() === 0,

        'orpheline' => $etp->getCheminPedagogique()->count() === 0,

        'url'       => $this->url('of', [], makeQuery($structure, $niveau, $etp)),

    ];

}