Commit e534e0a5 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_cotutelle' into test

parents a8600f90 426c78c0

module/TheseCotutelle/src/TheseCotutelle/Form/TheseCotutelleInscriptionForm.php

+1 −1
Changes for module/TheseCotutelle/src/TheseCotutelle/Form/TheseCotutelleInscriptionForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class TheseCotutelleInscriptionForm extends FichierRemplacableAwareForm implemen 
        $this->setAnneesUnivs(

            $this->anneeUnivService->fromDatesInterval(

                $object->getTheseCotutelle()->getDateDebut(),

                $object->getTheseCotutelle()->getDateFin()

                $object->getTheseCotutelle()->getDateFinIncludingAvenants()

            )

        );

        $anneesUnivsAsOptions = $this->getAnneesUnivsAsOptions();

module/TheseCotutelle/src/TheseCotutelle/Rule/PresencePeriodeDisponibleRule.php

+1 −1
Changes for module/TheseCotutelle/src/TheseCotutelle/Rule/PresencePeriodeDisponibleRule.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class PresencePeriodeDisponibleRule extends AbstractRule 
        $this->theseCotutelle = $this->theseCotutelleService->getRepository()->find($this->theseCotutelle->getId());



        $dateDebutCotutelle = clone $this->theseCotutelle->getDateDebut();

        $dateFinCotutelle = clone $this->theseCotutelle->getDateFin();

        $dateFinCotutelle = clone $this->theseCotutelle->getDateFinIncludingAvenants();



        $presences = $this->theseCotutelle->getPresences()->toArray();

        if (count($presences) === 0) {