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

Formation : La génération du pdf d'attestion est maintenant bloquée si l'enquête est non saisie

parent 347aa25b

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Journal des modifications 
-----

- Masquage des membres du CSI et de leurs saisies

- Formation : Amélioration de l'affichage de la liste des inscrits (état de la session, état de la saisie de l'enquête)

- Formation : La génération du pdf d'attestion est maintenant bloquée si l'enquête est non saisie



5.2.8

-----

module/Formation/src/Formation/Controller/InscriptionController.php

+11 −1
Changes for module/Formation/src/Formation/Controller/InscriptionController.php: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -271,8 +271,18 @@ class InscriptionController extends AbstractController 
    public function genererAttestationAction()

    {

        $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this);

        $session = $inscription->getSession();



        if ($inscription->getValidationEnquete() === null) {

            $vm = new ViewModel(

            [

                'title' => "Génération de l'attestation impossible",

                'message' => "Vous n'avez pas encore validé l'enquête de retour de la session de formation",

            ]);

            $vm->setTemplate('formation/default/message-info');

            return $vm;

        }



        $session = $inscription->getSession();

        $presences = $this->getPresenceService()->calculerDureePresence($inscription);



        $logos = [];

module/Formation/view/formation/default/message-info.phtml

0 → 100644
+17 −0
Changes for module/Formation/view/formation/default/message-info.phtml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php



/**

 * @var string $title

 * @var string $message

 */



$this->headTitle($title);

?>



<h1 class="page-header">

    <?php echo $title; ?>

</h1>



<div class="lead">

    <?php echo $message; ?>

</div>

module/Formation/view/formation/index/index-doctorant.phtml

+1 −1
Changes for module/Formation/view/formation/index/index-doctorant.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ $canCatalogueAfficher = $this->isAllowed(ModulePrivileges::getResourceId(ModuleP 
                                <a href="<?php echo $this->url('formation/enquete/repondre-questions', ['inscription' => $inscription->getId()], [], true); ?>">

                            <span class="icon icon-edit"

                                  title="Compléter l'enquête" data-bs-toggle="tooltip" data-bs-html="true"

                            ></span>Compléter l'enquête</a>

                            ></span>Compléter l'enquête</a><br/>

                                <?php /** @see \Formation\Controller\EnqueteQuestionController::validerQuestionsAction() */?>

                                <a href="<?php echo $this->url('formation/enquete/valider-questions', ['inscription' => $inscription->getId()], [], true); ?>"

                                   class="ajax-modal" data-event="modification"