Commit 11274d10 authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Date_Modif

parents 20e4d5a4 c005f50a

admin/migration/v18Indicateurs.php

+0 −2
Changes for admin/migration/v18Indicateurs.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ class v18Indicateurs extends AbstractMigration 


    public function utile(): bool

    {

        return true;



        return $this->manager->hasNew('table', 'TYPE_INDICATEUR');

    }

module/Application/src/Controller/OffreFormation/ElementPedagogiqueController.php

+2 −1
Changes for module/Application/src/Controller/OffreFormation/ElementPedagogiqueController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ use Application\Service\Traits\ContextServiceAwareTrait; 
use Application\Service\Traits\StructureServiceAwareTrait;

use Application\Service\Traits\VolumeHoraireEnsServiceAwareTrait;

use UnicaenImport\Service\Traits\SchemaServiceAwareTrait;



/**

 * Description of ElementPedagogiqueController

 *
@@ -307,7 +308,7 @@ class ElementPedagogiqueController extends AbstractController 


        $form->setElementPedagogique($element);

        $form->setAttribute('action', $this->url()->fromRoute('of/element/modulateurs-centres-couts', ['elementPedagogique' => $element->getId()]));

        $form->build();

        $form->buildElements();



        return [

            'form' => $form,

module/Application/src/Processus/Factory/ReconductionProcessusFactory.php

+8 −22
Changes for module/Application/src/Processus/Factory/ReconductionProcessusFactory.php: 8 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -18,24 +18,17 @@ use Laminas\ServiceManager\ServiceLocatorInterface; 
 *

 * @author LECOURTES Anthony <antony.lecourtes@unicaen.fr>

 */

class ReconductionProcessusFactory implements FactoryInterface

class ReconductionProcessusFactory

{



    /**

     * Create service

     *

     * @param ServiceLocatorInterface $serviceLocator

     *

     * @return ReconductionProcessus

     */

    public function createService(ServiceLocatorInterface $serviceLocator)

    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)

    {

        $etapeService              = $serviceLocator->get(EtapeService::class);

        $elementPedagogiqueService = $serviceLocator->get(ElementPedagogiqueService::class);

        $cheminPedagogiqueService  = $serviceLocator->get(CheminPedagogiqueService::class);

        $volumeHoraireEnsService   = $serviceLocator->get(VolumeHoraireEnsService::class);

        $anneeService              = $serviceLocator->get(AnneeService::class);

        $contextService            = $serviceLocator->get(ContextService::class);

        $etapeService = $container->get(EtapeService::class);

        $elementPedagogiqueService = $container->get(ElementPedagogiqueService::class);

        $cheminPedagogiqueService = $container->get(CheminPedagogiqueService::class);

        $volumeHoraireEnsService = $container->get(VolumeHoraireEnsService::class);

        $anneeService = $container->get(AnneeService::class);

        $contextService = $container->get(ContextService::class);



        $processus = new ReconductionProcessus($etapeService,

            $elementPedagogiqueService,
@@ -46,11 +39,4 @@ class ReconductionProcessusFactory implements FactoryInterface 


        return $processus;

    }







    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)

    {



    }

}
 
 No newline at end of file