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

Merge branch 'test'

parents 13e3e93d d0401cf4

module/Application/view/application/these/rdv-bu-doctorant.phtml

+1 −1
Changes for module/Application/view/application/these/rdv-bu-doctorant.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ use Application\View\Renderer\PhpRenderer; 
 * @var string          $nextStepUrl

 */



$canEdit = $this->isAllowed($these, ThesePrivileges::THESE_SAISIE_DESCRIPTION_VERSION_INITIALE);

$canEdit = $this->isAllowed($these, ThesePrivileges::THESE_SAISIE_RDV_BU);



$rdvBu = $these->getRdvBu();

?>

module/Application/view/application/validation/these-corrigee/validation-correction.phtml

+16 −4
Changes for module/Application/view/application/validation/these-corrigee/validation-correction.phtml: 16 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -45,10 +45,22 @@ $canUnvalidate = $this->isAllowed($these, ValidationPrivileges::VALIDATION_CORRE 
            <?php foreach ($attendues as $validation): ?>

                <li>

                    <?php echo $i = $validation->getIndividu() ?> n'a pas encore validé.

                    <?php if (! $i->getEmail()): ?>

                        <span class="text-danger"><small><span class="glyphicon glyphicon-warning-sign"></span>

                                Cette personne ne peut pas valider car son email n'est pas connu

                                dans <?php echo $i->getSource() ?>.</small></span>

                    <?php if (! $i->getSupannId()): ?>

                        <?php

                        $message = sprintf(

                            "Cette personne ne pourra pas utiliser l'application car il manque des informations la concernant dans %s (source code '%s').",

                            $validation->getIndividu()->getSource(),

                            $validation->getIndividu()->getSourceCode());

                        ?>

                        <p class="text-danger"><small><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $message ?></small></p>

                    <?php elseif (! $i->getEmail()): ?>

                        <?php

                        $message = sprintf(

                            "L'application n'a pas pu notifier cette personne car son email n'est pas connu dans %s (source code '%s').",

                            $validation->getIndividu()->getSource(),

                            $validation->getIndividu()->getSourceCode());

                        ?>

                        <p class="text-danger"><small><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $message ?></small></p>

                    <?php endif ?>

                </li>

            <?php endforeach ?>