Commit d9f293db authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

- Diverses corrections sur la reconduction offres

parent 94596fca

module/Application/src/Application/Entity/Db/Etape.php

+0 −11
Original line number Diff line number Diff line
@@ -32,17 +32,6 @@ class Etape implements HistoriqueAwareInterface, AnneeAwareInterface, ResourceIn 
        return $this->getLibelle();

    }



    public function __clone()

    {

        if($this->id)

        {

            $this->id = null;

        }

        $this->elementPedagogique = new ArrayCollection();



        return $this;

    }







    /**

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

+6 −6
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ class ReconductionProcessusFactory implements FactoryInterface 
     */

    public function createService(ServiceLocatorInterface $serviceLocator)

    {

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

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

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

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

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

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

        $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);



        $processus = new ReconductionProcessus($etapeService,

            $elementPedagogiqueService,

module/Application/src/Application/Service/OffreFormationService.php

+1 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class OffreFormationService extends AbstractEntityService 
        $sql .= 'ORDER BY

              gtf.ordre, e.niveau';



        $query = $this->em()->createQuery($sql);

        $query = $this->getEntityManager()->createQuery($sql);



        $query->setParameter('structure', $structure);

        $query->setParameter('annee', $annee);
@@ -220,10 +220,4 @@ class OffreFormationService extends AbstractEntityService 
        return $mappingEtape;

    }







    protected function em()

    {

        return \Application::$container->get(\Application\Constants::BDD);

    }

}
 
 No newline at end of file

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

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
                            <thead>

                                <tr class="<?php if($ec['reconduction'] == 'oui'){echo "active";}else{echo "info";}?>">

                                    <?php if($ec['reconduction'] == 'oui'): ?>

                                        <th><input title="Formation déjà reconduite pour l'année prochaine"  type="checkbox" class="checkbox-formation" disabled="disabled" name="etape[]" value="<?= $ec['etape']->getId(); ?>"/></th>

                                        <th><input title="Formation déjà reconduite pour l'année prochaine"  type="checkbox" class="checkbox-formation" disabled="disabled" name="etape[]" value="<?= $ec['etape']->getId(); ?>"/>  <span class="label label-warning" style="margin:0 auto;">Reconduit</span></th>

                                    <?php else: ?>

                                        <th><input type="checkbox" class="checkbox-formation" checked="checked" name="etape[]" value="<?= $ec['etape']->getId(); ?>"/></th>

                                    <?php endif; ?>
@@ -95,6 +95,7 @@ 
                                        <?php if($ep['reconduction'] == 'oui'): ?>

                                            <td>

                                                <input title="Elément pédagogique déjà reconduit pour l'année prochaine" class="checkbox-element" disabled="disabled" type="checkbox" name="element[<?php echo $ec['etape']->getId();?>][]" value="<?= $ep['element']->getId(); ?>"/>

                                                <span class="label label-warning">Reconduit</span>

                                            </td>

                                        <?php else: ?>

                                            <td><input class="checkbox-element" type="checkbox" checked="checked" name="element[<?php echo $ec['etape']->getId();?>][]" value="<?= $ep['element']->getId(); ?>"/></td>