Commit 3669011c authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Date_Modif

parents 54856a04 879cd99f

data/ddl/table/CORPS.php

+1 −1
Changes for data/ddl/table/CORPS.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ return [ 
            'name'        => 'LIBELLE_LONG',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 100,

            'length'      => 150,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

data/ddl/unique-constraint/INTERVENANT_CODE_UN.php

0 → 100644
+17 −0
Changes for data/ddl/unique-constraint/INTERVENANT_CODE_UN.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'INTERVENANT_CODE_UN',

    'table'   => 'INTERVENANT',

    'index'   => 'INTERVENANT_CODE_UN',

    'columns' => [

        'CODE',

        'ANNEE_ID',

        'STATUT_ID',

        'HISTO_DESTRUCTION',

    ],

];



//@formatter:on

data/ddl/unique-constraint/INTERVENANT_SOURCE_UN.php

0 → 100644
+17 −0
Changes for data/ddl/unique-constraint/INTERVENANT_SOURCE_UN.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'INTERVENANT_SOURCE_UN',

    'table'   => 'INTERVENANT',

    'index'   => 'INTERVENANT_SOURCE_UN1',

    'columns' => [

        'SOURCE_CODE',

        'ANNEE_ID',

        'HISTO_DESTRUCTION',

        'STATUT_ID',

    ],

];



//@formatter:on

data/ddl/unique-constraint/INTERVENANT_UTIL_CODE_UN.php

0 → 100644
+17 −0
Changes for data/ddl/unique-constraint/INTERVENANT_UTIL_CODE_UN.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'INTERVENANT_UTIL_CODE_UN',

    'table'   => 'INTERVENANT',

    'index'   => 'INTERVENANT_UTIL_CODE_UN',

    'columns' => [

        'UTILISATEUR_CODE',

        'ANNEE_ID',

        'STATUT_ID',

        'HISTO_DESTRUCTION',

    ],

];



//@formatter:on

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

+4 −8
Changes for module/Application/src/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php: 4 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -166,10 +166,6 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset 


    protected function getData()

    {

        $key = $this->getServiceContext()->getAnnee()->getId();



        if (!$this->getSessionContainer()->{$key}) {



        $sql = "

            SELECT DISTINCT

              s.id structure_id,
@@ -177,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
@@ -188,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(
@@ -236,10 +234,8 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset 
        asort($result['structures']);

        asort($result['niveaux']);

        asort($result['etapes']);

            $this->getSessionContainer()->{$key} = $result;

        }



        return $this->getSessionContainer()->{$key};

        return $result;

    }