Commit 6aa878db authored by joriot221's avatar joriot221
Browse files

Prise en compte des elem pedago supprimé

parent b8a52bbb

module/Application/src/Service/OffreFormationService.php

+6 −2
Changes for module/Application/src/Service/OffreFormationService.php: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -223,7 +223,12 @@ class OffreFormationService extends AbstractEntityService 
            $codesEtapeN1[] = $v->getCode();

        }



//        $histoDestru = [];



        foreach ($etapes as $v) {

//            if($v->getHistoDestruction() != NULL){

//                $histoDestru[] = $v;

//            }

            $offresComplementaires[$v->getId()]['reconduction_partiel'] = 'non';

            $offresComplementaires[$v->getId()]['elements_pedagogique'] = [];

            $offresComplementaires[$v->getId()]['etape']                = $v;
@@ -236,10 +241,9 @@ class OffreFormationService extends AbstractEntityService 
            }

        }



        $elementResultat = [];

        foreach ($elements as $v) {



            if ($v->getSource() != $source) {

            if ($v->getSource() != $source || $v->getHistoDestruction() != null) {

                continue;

            }

            $etapeId = $v->getEtape()->getId();

module/Application/view/application/offre-formation/reconduction.phtml

+1 −1
Changes for module/Application/view/application/offre-formation/reconduction.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ $this->headScript()->offsetSetFile(100, $this->basePath('/js/reconduction-offre. 
                $selectStructure = new \Laminas\Form\Element\Select('structure');

                $selectStructure

                    ->setValueOptions(['' => "(Sélectionnez une composante)"] + \UnicaenApp\Util::collectionAsOptions($structures))

                    ->setValue($structure ? $structure->getId() : null)

                    ->setValue($structure?->getId())

                    ->setAttributes(['class' => 'structure',

                                     'style' => 'width:250px;']);

                echo $this->formSelect($selectStructure);