Commit af516070 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'hotfix_sursis_soutenance'

parents 624887fe 8da19958

module/Soutenance/src/Soutenance/Assertion/PropositionAssertion.php

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class PropositionAssertion implements AssertionInterface { 
            }

        }

        $sursis = ($proposition)?$proposition->hasSursis():false;

        $dateValidationMax = DateTime::createFromFormat('d/m/Y',$proposition->getDate()->format('d/m/Y'))->sub(new DateInterval('P2M'));

        $dateValidationMax = ($proposition->getDate())?DateTime::createFromFormat('d/m/Y',$proposition->getDate()->format('d/m/Y'))->sub(new DateInterval('P2M')):null;

        $dateCurrent = new DateTime();



        $role = $this->userContextService->getSelectedIdentityRole()->getCode();

module/Soutenance/view/soutenance/proposition/partial/validations-acteurs.phtml

+2 −0
Original line number Diff line number Diff line
@@ -82,10 +82,12 @@ $these = $proposition->getThese(); 
                        </div>

                    <?php endif; ?>

                    <?php if (!$canValiderActeur) : ?>

                        <?php if (!$proposition->hasSursis()) : ?>

                            <div class="alert alert-warning">

                                <span class="glyphicon glyphicon-warning-sign"></span>

                               Il est possible de valider une proposition seulement si le délai de deux mois entre la date de validation et la date de soutenance est respecté.

                            </div>

                        <?php endif; ?>

                    <?php else : ?>

                            <a

                                <?php /** @see \Soutenance\Controller\PropositionController::validerActeurAction(); */ ?>