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

Fix problème d'affichage de la charte si on n'est pas étudiant

parent 07b0bf5a

module/Application/src/Controller/CharteController.php

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class CharteController extends AbstractActionController { 
        $var = ['etudiant' => $etudiant];

        $rendu = $this->getRenduService()->generateRenduByTemplateCode($templateCode, $var, false);



        $instance = $etudiant->getValidationActiveByTypeCode(CharteValidations::CHARTE_SIGNEE);

        $instance = $etudiant?->getValidationActiveByTypeCode(CharteValidations::CHARTE_SIGNEE);



        return new ViewModel([

            'title' => $rendu->getSujet(),

module/Application/view/application/charte/afficher.phtml

+4 −1
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 
/**

 * @see \Application\Controller\CharteController::afficherAction()

 * @var Rendu $rendu

 * @var ?Etudiant $etudiant

 * @var ValidationInstance $instance

 */



use Etudiant\Entity\Db\Etudiant;

use UnicaenRenderer\Entity\Db\Rendu;

use UnicaenValidation\Entity\Db\ValidationInstance;





?>



<div class="card">
@@ -19,6 +20,7 @@ use UnicaenValidation\Entity\Db\ValidationInstance; 
    <div class="card-body">

        <?php echo $rendu->getCorps(); ?>



        <?php if ($etudiant !== null) : ?>

            <?php if ($instance === null) : ?>

                <div>

                    <?php /** @see AgentController::validerCharteAction() */ ?>
@@ -42,5 +44,6 @@ use UnicaenValidation\Entity\Db\ValidationInstance; 
                    par <?php echo $instance->getHistoCreateur()->getDisplayName(); ?>

                </div>

            <?php endif; ?>

        <?php endif; ?>

    </div>

</div>