Commit 879cd99f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE 

 Conflicts:
	module/Application/src/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php
parents b0e133a9 ec5a72d3

module/Application/src/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php

+3 −1
Changes for module/Application/src/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset 
              gtf.libelle_court || e.niveau niveau_id,

              gtf.libelle_court || e.niveau niveau_libelle,

              e.id etape_id,

              e.libelle etape_libelle

              e.libelle etape_libelle,

              gtf.ordre

            FROM

              element_pedagogique ep

              JOIN chemin_pedagogique cp ON cp.element_pedagogique_id = ep.id AND cp.histo_destruction IS NULL
@@ -184,6 +185,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset 
            WHERE

              ep.histo_destruction IS NULL

              AND ep.annee_id = :annee

            ORDER BY gtf.ordre ASC

              ";



        $res = $this->getEntityManager()->getConnection()->fetchAllAssociative(