Commit 55e690b1 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'b14' of https://git.unicaen.fr/open-source/OSE into b14

parents 95d15823 c80718ae

module/Application/src/Application/Form/OffreFormation/ElementModulateurCentreCoutForm.php

+8 −7
Changes for module/Application/src/Application/Form/OffreFormation/ElementModulateurCentreCoutForm.php: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Application\Form\OffreFormation;



use Application\Entity\Db\CentreCout;

use Application\Entity\Db\ElementPedagogique;

use Application\Form\AbstractForm;

use Application\Form\OffreFormation\Traits\ElementModulateursFieldsetAwareTrait;
@@ -67,8 +68,7 @@ class ElementModulateurCentreCoutForm extends AbstractForm 
        //Formulaire partie Modulateur de l'élément pédagogique en cours

        $typeModulateurs = $this->getServiceTypeModulateur()->finderByElementPedagogique($elementPedagogique)->getQuery()->getResult();

        if (!empty($typeModulateurs)) {

            foreach($typeModulateurs as $typeModulateur)

            {

            foreach ($typeModulateurs as $typeModulateur) {

                $values = $typeModulateur->getModulateur();

                foreach ($values as $value) {

                    $modulateursValues[$typeModulateur->getCode()][$value->getCode()] = $value->getLibelle();
@@ -97,7 +97,7 @@ class ElementModulateurCentreCoutForm extends AbstractForm 
        }

        $typeHeuresEp = $elementPedagogique->getTypeHeures()->getValues();

        foreach ($typeHeuresEp as $typeHeures) {

            $selectCentreCout = $this->createSelectElementCentreCout($typeHeures);

            $selectCentreCout = $this->createSelectElementCentreCout($typeHeures, $elementPedagogique);

            if (array_key_exists($typeHeures->getCode(), $centresCoutsValues)) {

                $selectCentreCout->setValue($centresCoutsValues[$typeHeures->getCode()]);

            }
@@ -113,11 +113,12 @@ class ElementModulateurCentreCoutForm extends AbstractForm 






    private function createSelectElementCentreCout(\Application\Entity\Db\TypeHeures $th)

    private function createSelectElementCentreCout(\Application\Entity\Db\TypeHeures $th, ElementPedagogique $elementPedagogique)

    {

        //retrieve centre cout by types heures

        $qb           = $this->getServiceCentreCout()->finderByTypeHeures($th);

        $centresCouts = $qb->getQuery()->execute();

        $filter       = function (CentreCout $centreCout) use ($th) {

            return $centreCout->getTypeHeures()->contains($th);

        };

        $centresCouts = $elementPedagogique->getStructure()->getCentreCout()->filter($filter);

        $valueOptions = [];

        foreach ($centresCouts as $centreCout) {

            $valueOptions[$centreCout->getCode()] = $centreCout->getCode() . ' - ' . $centreCout->getLibelle();