Commit 876d2540 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajustement importation lagaf

parent 5a889735

module/Formation/config/merged/import-lagaf.config.php

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ return [ 
                        'options' => [

                            'route' => '/importation-lagaf',

                            'defaults' => [

                                /**  @see ImportationLagafController::indexAction() **/

                                'controller' => ImportationLagafController::class,

                                'action' => 'index',

                            ]

module/Formation/src/Formation/Controller/ImportationLagafController.php

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ class ImportationLagafController extends AbstractActionController 


            $idOrig = $st_action_id . "-" . $st_session_id;

            if ($dictionnaireA[$st_action_id] !== null) {

                if ($dictionnaireS[$idOrig] === null) {

                if (!isset($dictionnaireS[$idOrig])) {

                    $instance = new FormationInstance();

                    $instance->setFormation($dictionnaireA[$st_action_id]);

                    $instance->setComplement($st_responsable);

module/Formation/src/Formation/Service/FormationGroupe/FormationGroupeService.php

+13 −15
Original line number Diff line number Diff line
@@ -166,16 +166,11 @@ class FormationGroupeService 
        try {

            $result = $qb->getQuery()->getOneOrNullResult();

        } catch (NonUniqueResultException $e) {

            throw new RuntimeException("Plusieurs FormationGroupe paratagent le même id [" . $id . "]");

            throw new RuntimeException("Plusieurs FormationGroupe paratagent le même id [" . $id . "]",0,$e);

        }

        return $result;

    }



    /**

     * @param AbstractActionController $controller

     * @param string $param

     * @return FormationGroupe

     */

    public function getRequestedFormationGroupe(AbstractActionController $controller, string  $param = 'formation-groupe') : ?FormationGroupe

    {

        $id = $controller->params()->fromRoute($param);
@@ -183,10 +178,6 @@ class FormationGroupeService 
        return $result;

    }



    /**

     * @param string|null $libelle

     * @return FormationGroupe|null

     */

    public function getFormationGroupeByLibelle(?string $libelle, ?Axe $axe = null) : ?FormationGroupe

    {

        if ($libelle === null) return null;
@@ -207,11 +198,18 @@ class FormationGroupeService 


    public function getFormationGroupeBySource(string $source, $id) : ? FormationGroupe

    {

        try {

            $qb = $this->getEntityManager()->getRepository(FormationGroupe::class)->createQueryBuilder('groupe')

                ->andWhere('groupe.source = :source')->setParameter('source', $source)

            ->andWhere('groupe.idSource = :id')->setParameter('id', $id)

        ;

                ->andWhere('groupe.idSource = :id')->setParameter('id', $id);

        } catch (NotSupported $e) {

            throw new RuntimeException("Un problème est survenu lors de la creation du querybuilder",0,$e);

        }

        try {

            $result = $qb->getQuery()->getOneOrNullResult();

        } catch (NonUniqueResultException $e) {

            throw new RuntimeException("Plusieurs FormationGroupe partagent la même source [".$source."|".$id."].",0, $e);

        }

        return $result;

    }

module/Formation/src/Formation/Service/FormationInstance/FormationInstanceService.php

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ class FormationInstanceService 
    public function getFormationsInstances(string $champ = 'id', string $ordre = 'ASC'): array

    {

        $qb = $this->createQueryBuilder()

            ->join('Finstance.source', 'source')->addSelect('source')

            ->orderBy('Finstance.' . $champ, $ordre);



        $result = $qb->getQuery()->getResult();