Commit 0709a40e authored by Laurent Lecluse's avatar Laurent Lecluse Committed by Antony Le Courtes
Browse files

Petits ajustements

parent 0ae325e1

module/Application/config/administration.config.php

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ return [ 
                        Privileges::DOMAINES_FONCTIONNELS_ADMINISTRATION_VISUALISATION,

                        Privileges::MOTIFS_MODIFICATION_SERVICE_DU_VISUALISATION,

                        Privileges::MOTIF_NON_PAIEMENT_VISUALISATION,

                        Privileges::ODF_RECONDUCTION_OFFRE,

                    ],

                    'assertion'  => Assertion\GestionAssertion::class,

                ],

module/Application/config/offre-formation.config.php

+3 −2
Original line number Diff line number Diff line
@@ -371,7 +371,9 @@ return [ 
            Service\TypeModulateurService::class       => Service\TypeModulateurService::class,

            Service\DomaineFonctionnelService::class   => Service\DomaineFonctionnelService::class,

            Assertion\OffreDeFormationAssertion::class => Assertion\OffreDeFormationAssertion::class,

            Processus\ReconductionProcessus::class     => Processus\ReconductionProcessusFactory::class,

        ],

        'factories'  => [

            Processus\ReconductionProcessus::class => Processus\Factory\ReconductionProcessusFactory::class,

        ],

    ],

    'form_elements'   => [
@@ -388,7 +390,6 @@ return [ 
        ],

        'factories'  => [

            Form\OffreFormation\VolumeHoraireEns::class => Form\OffreFormation\Factory\VolumeHoraireEnsFormFactory::class,

            Processus\ReconductionProcessusFactory::class => Processus\Factory\ReconductionProcessusFactory::class,

        ],

    ],

    'view_helpers'    => [

module/Application/src/Application/Controller/OffreFormationController.php

+7 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class OffreFormationController extends AbstractController 
                $element->getPeriode(),

                $element->getTauxFoad(),

                $element->getTauxFi(),

                $elemendockt->getTauxFa(),

                $element->getTauxFa(),

                $element->getTauxFc(),

                $effectifs ? $effectifs->getFi() : null,

                $effectifs ? $effectifs->getFa() : null,
@@ -148,7 +148,12 @@ class OffreFormationController extends AbstractController 
        list($structure, $niveau, $etape) = $this->getParams();

        //Get role of user

        $role = $this->getServiceContext()->getSelectedIdentityRole();

        $structures   = $this->getServiceStructure()->getList($this->getServiceStructure()->finderByRole($role));



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

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

        $this->getServiceStructure()->finderByRole($role, $qb);

        $structures = $this->getServiceStructure()->getList($qb);



        $anneeEnCours = $this->getServiceContext()->getAnnee();

        list($offresComplementaires, $mappingEtape, $reconductionTotale) = $this->getServiceOffreFormation()->getOffreComplementaire($structure, $niveau, $etape);

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class OffreFormationService extends AbstractEntityService 
        $offresComplementaires = [];

        $anneeEnCours          = $this->getServiceContext()->getAnnee();

        $anneeSuivante         = $this->getServiceAnnee()->getSuivante($anneeEnCours);

        $source                = $this->getServiceSource()->get('1');

        $source                = $this->getServiceSource()->getOse();



        $this->getServiceLocalContext()

            ->setStructure($structure)