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

Ajout de la colonne Structure pour l'export de l'ODF


(cherry picked from commit 37297b43)
parent d7739613
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace OffreFormation\Controller;

use Application\Controller\AbstractController;
use Application\Service\Traits\AnneeServiceAwareTrait;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\LocalContextServiceAwareTrait;
@@ -27,7 +28,7 @@ use UnicaenImport\Service\Traits\SchemaServiceAwareTrait;
 *
 *
 */
class OffreFormationController extends \Application\Controller\AbstractController
class OffreFormationController extends AbstractController
{
    use ContextServiceAwareTrait;
    use LocalContextServiceAwareTrait;
@@ -95,6 +96,7 @@ class OffreFormationController extends \Application\Controller\AbstractControlle

        $csvModel = new CsvModel();
        $csvModel->setHeader([
            'Structure',
            'Code formation',
            'Libellé formation',
            'Niveau',
@@ -146,6 +148,7 @@ class OffreFormationController extends \Application\Controller\AbstractControlle
            $effectifs  = $element->getEffectifs();
            $discipline = $element->getDiscipline();
            $csvModel->addLine([
                $etape->getStructure()->getLibelleCourt(),
                $etape->getCode(),
                $etape->getLibelle(),
                $etape->getNiveauToString(),
+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ class OffreFormationService extends AbstractEntityService
                partial tf.{id},
                partial gtf.{id, libelleCourt, ordre, pertinenceNiveau},
                partial ep.{id,code,libelle,sourceCode,etape,periode,tauxFoad,fi,fc,fa,tauxFi,tauxFc,tauxFa},
                partial vme.{id,heures, groupes}
                partial vme.{id,heures, groupes},
                partial s.{id,libelleCourt}
            FROM
              OffreFormation\Entity\Db\Etape e
              JOIN e.structure s