Commit d8a74b80 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'master' into alc-recherche-intervenant

parents 7fef9225 24a09501

code/GenerationTraitsInterfaces.php

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ $introspection = \UnicaenCode\Util::introspection(); 




$traits = $introspection->getTraits();

//$traits = [\Application\Form\OffreFormation\Traits\ElementPedagogiqueRechercheFieldsetAwareTrait::class];

//$traits = [\OffreFormation\Form\Traits\ElementPedagogiqueRechercheFieldsetAwareTrait::class];

foreach ($traits as $trait) {

    $params = $introspection->getTraitParams($trait);

    if ($params['aware']) {

config/application.config.php

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ class AppConfig 
            'Referentiel',

            'Mission',

            'Paiement',

            'OffreFormation',

            'Plafond',

            'Indicateur',

            'ExportRh',

config/autoload/unicaen-app.global.php

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ $versionFile = dirname(dirname(__DIR__)) . '/VERSION'; 
if (file_exists($versionFile)) {

    $version = file_get_contents($versionFile);

} else {

    $version = AppConfig::getEnv() . '12345';

    $version = AppConfig::getEnv();

}



return [

data/Etats de sortie/export_services_csv.php

+8 −6
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


// initialisation



use OffreFormation\Entity\Db\TypeIntervention;



$res               = [];

$shown             = [];

$typesIntervention = [];
@@ -126,7 +128,7 @@ foreach ($data as $d) { 
    if ($d['TYPE_INTERVENTION_ID'] != null) {

        $tid = $d['TYPE_INTERVENTION_ID'];

        if (!isset($typesIntervention[$tid])) {

            $typesIntervention[$tid] = $entityManager->getRepository(\Application\Entity\Db\TypeIntervention::class)->find($tid);

            $typesIntervention[$tid] = $entityManager->getRepository(TypeIntervention::class)->find($tid);

        }

        $typeIntervention = $typesIntervention[$tid];

        $invertTi['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getId();
@@ -210,7 +212,7 @@ uasort($typesIntervention, function ($ti1, $ti2) { 
    return $ti1->getOrdre() - $ti2->getOrdre();

});

foreach ($typesIntervention as $typeIntervention) {

    /* @var $typeIntervention \Application\Entity\Db\TypeIntervention */

    /* @var \OffreFormation\Entity\Db\TypeIntervention $typeIntervention */

    $head['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getCode();

}

$head['heures-ref'] = 'Référentiel';

data/ddl/index/EP_TAUX_REMU_FK.php

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'EP_TAUX_REMU_FK',

    'unique'  => FALSE,

    'table'   => 'ELEMENT_PEDAGOGIQUE',

    'columns' => [

        'TAUX_REMU_ID',

    ],

];



//@formatter:on