Commit 722bf863 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Modulateurs-Statuts' and 'v8' of... 

Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml
parent 57bb34b0

module/Application/src/Application/Controller/ModulateurController.php

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ class modulateurController extends AbstractController 
            $typeModulateurStructure = $this->getServiceTypeModulateurStructure()->newEntity()

                ->setTypeModulateur($typeModulateur);

        } else {

            $title = 'Édition d\'une sructure pour le type de modulateur';

            $title = 'Édition d\'une structure pour le type de modulateur';

        }



        $form->bindRequestSave($typeModulateurStructure, $this->getRequest(), function (typeModulateurStructure $tms) {

module/Application/view/application/modulateur/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ foreach ($typeModulateurs as $tm) { 
                            <div class="col-md-9">Saisie par ens:</div>

                            <div class="col-md-3"><?= affBooleen($tm->getSaisieParEnseignant()) ?></div>

                        </div>

                        <table class="table table-bordered table-condensed">

                        <table class="table table-bordered table-condensed table-extra-condensed" style="margin-top:0.5em; margin-bottom:1px;">

                            <?php foreach ($typeModulateurStructures

                                           as $tms) { ?>

                                <?php if (($tm->getId() == $tms->getTypeModulateur()->getId()) && ((!$tms->getAnneeDebut()) || ($tms->getAnneeDebut()->getId() <= $anneeId)) && ((!$tms->getAnneeFin()) || ($tms->getAnneeFin()->getId() >= $anneeId))) { ?>