Commit bc5a787d authored by Florian Joriot's avatar Florian Joriot
Browse files

Modification recuperation formation pour code_type_diplome 

recuperation d'une etape pour l'element si aucune etape n'est trouvé
parent 2b158cee

admin/pegase/src/Adapter/DataAdapterInterface.php

+2 −1
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ 
namespace Adapter;



use Entity\Odf;

use Unicaen\BddAdmin\Bdd;



interface DataAdapterInterface

{

    public function run(Odf $odf): void;

    public function run(Odf $odf, Bdd $pegase = null): void;

admin/pegase/src/Adapter/EtapeAdapter.php

+18 −1
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ namespace Adapter; 


use Entity\Odf;

use Exception;

use Unicaen\BddAdmin\Bdd;



class EtapeAdapter implements DataAdapterInterface

{

    /**

     * @throws Exception

     */

    public function run(Odf $odf): void

    public function run(Odf $odf, Bdd $pegase = null): void

    {

        $console = \OseAdmin::instance()->console();

        $console->println('Traitement des étapes récupérées');
@@ -26,6 +27,22 @@ class EtapeAdapter implements DataAdapterInterface 
                continue;

            }



            if($etape->getTypeFormationId() == null) {

                $sql = 'SELECT om_enfant.id as id_objet, COALESCE(om_parent_n2.code_type_diplome, om_parent.code_type_diplome) as code_type_diplome

                FROM schema_odf.enfant e

                LEFT JOIN schema_odf.enfant e_n2 ON e.id_objet_maquette_parent = e_n2.id_objet_maquette

                LEFT JOIN schema_odf.objet_maquette om_parent_n2 ON e_n2.id_objet_maquette_parent = om_parent_n2.id



                JOIN schema_odf.objet_maquette om_enfant ON e.id_objet_maquette = om_enfant.id

                JOIN schema_odf.objet_maquette om_parent ON om_parent.id = e.id_objet_maquette_parent

                WHERE e.id_objet_maquette = :id_objet';

                $param['id_objet'] = $etape->getSourceCode();

                $res =  $pegase->select($sql, $param, ['fetch' => Bdd::FETCH_EACH]);

                while ($parent = $res->next()) {

                    $etape->setTypeFormationId($parent['code_type_diplome']);

                    break;

                }

            }



            $code      = $etape->getCode();

            $increment = 0;

admin/pegase/src/Adapter/LienAdapter.php

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Adapter; 


use Entity\NoeudOld;

use Entity\Odf;

use Unicaen\BddAdmin\Bdd;



class LienAdapter implements DataAdapterInterface

{
@@ -13,7 +14,7 @@ class LienAdapter implements DataAdapterInterface 
     *

     * @return void

     */

    public function run(Odf $odf): void

    public function run(Odf $odf, Bdd $pegase = null): void

    {

        foreach ($odf->getMaquettes() as $maquette) {

admin/pegase/src/Adapter/NoeudAdapter.php

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Adapter; 


use Entity\NoeudOld;

use Entity\Odf;

use Unicaen\BddAdmin\Bdd;



class NoeudAdapter implements DataAdapterInterface

{
@@ -13,7 +14,7 @@ class NoeudAdapter implements DataAdapterInterface 
     *

     * @return void

     */

    public function run(Odf $odf): void

    public function run(Odf $odf, Bdd $pegase = null): void

    {

        foreach ($odf->getObjetsFormation() as $objetFormation) {

            $noeud = new NoeudOld($odf);

admin/pegase/src/Adapter/ObjetFormationAdapter.php

+5 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Entity\ElementPedagogique; 
use Entity\Odf;

use Exception;

use Entity\CheminPedagogique;

use Unicaen\BddAdmin\Bdd;

use function PHPUnit\Framework\isEmpty;



class ObjetFormationAdapter implements DataAdapterInterface
@@ -14,7 +15,7 @@ class ObjetFormationAdapter implements DataAdapterInterface 
    /**

     * @throws Exception

     */

    public function run(Odf $odf): void

    public function run(Odf $odf, Bdd $pegase = null): void

    {

        $console = \OseAdmin::instance()->console();

        $console->println('Traitement des objet de formation récupérés');
@@ -64,17 +65,17 @@ class ObjetFormationAdapter implements DataAdapterInterface 
                        }

                    }

                    $elementToAdd->setCode($code);

                    if ($etape->getStructureId() == $elementToAdd->getStructureId() || $etape->getStructureId() == null) {

                    if ($elementToAdd->getEtapeId() == null) {

                        $elementToAdd->setEtapeId($etape->getSourceCode());

                    } else {

                        $ecco = $elementToAdd->getCode() . '----' . $etape->getCode() . '-----' . $etape->getStructureId();

                    }



                    for ($i = $periodesAnnee['anneeDebut']; $i <= $periodesAnnee['anneeFin']; $i++) {

                        $codePresent[$i][$code] = $code;

                    }





                    $elementsPedagogiquesToAdd[$elementToAdd->getSourceCode()] = $elementToAdd;



                } else {

                    $elemTest = $elementsPedagogiquesToAdd[$elementPedagogique->getSourceCode()];