Commit c72f0a53 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 70bc57fc 8b804554
Loading
Loading
Loading
Loading
Loading
+10 −1
Changes for data/Etats de sortie/export_services.php: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,9 +45,18 @@ foreach ($data as $d) {
    }

    if (!isset($transData['intervenants'][$iid]['services'][$sid])) {
        if ($d['TYPE_FORMATION_LIBELLE']) {
            $typeFormation = $d['TYPE_FORMATION_LIBELLE'];
        } else {
            if ($d['FONCTION_REFERENTIEL_LIBELLE']) {
                $typeFormation = "Référentiel";
            } else {
                $typeFormation = "Hors établissement";
            }
        }
        $transData['intervenants'][$iid]['services'][$sid] = [
            'composante'     => $d['SERVICE_STRUCTURE_ENS_LIBELLE'],
            'type_formation' => $d['TYPE_FORMATION_LIBELLE'] ?: 'Référentiel',
            'type_formation' => $typeFormation,
            'formation'      => $d['ETAPE_LIBELLE'] ? $d['ETAPE_LIBELLE'] : $d['ETABLISSEMENT_LIBELLE'],
            'enseignement'   => $d['ELEMENT_LIBELLE'] ? $d['ELEMENT_LIBELLE'] : $d['FONCTION_REFERENTIEL_LIBELLE'],
            'fi'             => 0,