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

Ajout de la possibilité d'enregistrer et de valider l'enquête de retour de formation

parent e6062570

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Journal des modifications 
- Dépôts de nouveaux fichiers divers : charte du doctorat et convention de formation doctorale.

- Extraction d'un module Depot (dépôt du manuscrit de thèse).

- Amélioration de l'index doctorant du module formation

- Ajout de la possibilité d'enregistrer et de valider l'enquête de retour de formation

- [FIX] Retrait de la liste complémentaire du mail d'echec

- [FIX] Ordonnancement des séances sur les index des formations et des sessions 

- [FIX] Correction paramètre de route erronée + suppression bouton inactif

module/Formation/src/Formation/Controller/EnqueteQuestionController.php

+7 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ class EnqueteQuestionController extends AbstractController { 


    /** REPONSES ******************************************************************************************************/



    public function repondreQuestionsAction() : ViewModel

    public function repondreQuestionsAction()

    {

        $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this);
@@ -327,6 +327,12 @@ class EnqueteQuestionController extends AbstractController { 
                    if ($reponse->getHistoCreation()) $this->getEnqueteReponseService()->update($reponse);

                    else $this->getEnqueteReponseService()->create($reponse);

                }



                if (isset($data['enregistrer_valider'])) {

                    $inscription->setValidationEnquete(new DateTime());

                    $this->getInscriptionService()->update($inscription);

                    return $this->redirect()->toRoute('formation/index-doctorant', ['doctorant' => $inscription->getDoctorant()->getId()], [], true);

                }

            }

        }

module/Formation/src/Formation/Form/EnqueteReponse/EnqueteReponseForm.php

+16 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class EnqueteReponseForm extends Form 
        }

        $this->add([

            'type' => Button::class,

            'name' => 'bouton',

            'name' => 'enregistrer',

            'options' => [

                'label' => '<i class="fas fa-save"></i> Enregistrer',

                'label_options' => [
@@ -64,6 +64,21 @@ class EnqueteReponseForm extends Form 
            ],

        ]);



        $this->add([

            'type' => Button::class,

            'name' => 'enregistrer_valider',

            'options' => [

                'label' => '<i class="fas fa-check"></i> Enregistrer et valider',

                'label_options' => [

                    'disable_html_escape' => true,

                ],

            ],

            'attributes' => [

                'type' => 'submit',

                'class' => 'btn btn-success',

            ],

        ]);



        $filter = [];

        foreach ($questions as $question) {

            $filter['select_' . $question->getId() ] = ['required' => true,];

module/Formation/view/formation/enquete-question/repondre-questions.phtml

+2 −1
Original line number Diff line number Diff line
@@ -82,5 +82,6 @@ usort($categories, function (EnqueteCategorie $a, EnqueteCategorie $b) { return 
<?php endif; ?>





<?php echo $this->formControlGroup($form->get("bouton")); ?>

<?php echo $this->formControlGroup($form->get("enregistrer")); ?>

<?php echo $this->formControlGroup($form->get("enregistrer_valider")); ?>

<?php echo $this->form()->closeTag(); ?>

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

+3 −3
Original line number Diff line number Diff line
@@ -433,21 +433,21 @@ $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></a>

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

                                <?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"

                                >

                            <span class="icon icon-checked"

                                  title="Valider l'enquête" data-bs-toggle="tooltip" data-bs-html="true"

                            ></span></a>

                            ></span>Valider l'enquête</a>

                            <?php endif; ?>

                            <?php if ($inscription->getValidationEnquete() !== null AND $canAttestationInscription) : ?>

                                <?php /** @see \Formation\Controller\InscriptionController::genererAttestationAction() */?>

                                <a href="<?php echo $this->url('formation/inscription/generer-attestation', ['inscription' => $inscription->getId()], [], true); ?>" target="_blank">

                            <span class="icon icon-pdf"

                                  title="Télécharger l'attestation" data-bs-toggle="tooltip" data-bs-html="true"

                            ></span></a>

                            ></span>Télécharger l'attestation</a>

                            <?php endif; ?>

                        <?php else :?>

                            Pas de présence