Commit e72de923 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

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

# Conflicts:
#	code/template/GenerateRubrique/config_php
#	code/template/GenerateRubrique/controller_php
#	code/template/GenerateRubrique/idx1
parent b31f4d0b

module/Application/src/Application/Form/CentreCout/CentreCoutStructureSaisieForm.php

+10 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ class CentreCoutStructureSaisieForm extends AbstractForm 
    use CentreCoutStructureServiceAwareTrait;







    public function init()

    {

        $hydrator = new CentreCoutStructureHydrator();
@@ -45,9 +46,8 @@ class CentreCoutStructureSaisieForm extends AbstractForm 
            ],

            'type'       => 'Select',

        ]);

        $qb = $this->getServiceStructure()->finderByEnseignement();

        $this->get('structure')

            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getServiceStructure()->getList($qb)));

            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions(getStructures()));



        $this->add(new Csrf('security'));

        $this->add([
@@ -63,16 +63,18 @@ class CentreCoutStructureSaisieForm extends AbstractForm 
    }







    public function getStructures()

    {

        $serviceStructure = $this->getServiceStructure();

        $qb = $serviceStructure->finderByHistorique();

        $qb               = $serviceStructure->finderByEnseignement();

        $structures       = $serviceStructure->getList($qb);



        return $structures;

    }







    /**

     * Should return an array specification compatible with

     * {@link Zend\InputFilter\Factory::createInputFilter()}.
@@ -96,6 +98,9 @@ class CentreCoutStructureSaisieForm extends AbstractForm 
}











class CentreCoutStructureHydrator implements HydratorInterface

{

    use StructureServiceAwareTrait;
@@ -103,6 +108,7 @@ class CentreCoutStructureHydrator implements HydratorInterface 
    use CentreCoutServiceAwareTrait;







    /**

     * Hydrate $object with the provided $data.

     *
@@ -122,6 +128,7 @@ class CentreCoutStructureHydrator implements HydratorInterface 
    }







    /**

     * Extract values from an object

     *