Commit 691c80d0 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

bug génération rapport technique, bug js pour les checkbox confidentialité

parent 01d5e0aa

module/HDR/view/hdr/hdr-saisie/partial/generalites.phtml

+3 −0
Changes for module/HDR/view/hdr/hdr-saisie/partial/generalites.phtml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -138,5 +138,8 @@ use HDR\Fieldset\Generalites\GeneralitesFieldset; 
                updateVersionDiplomeOptionsForSelectedEtablissement();

                $versionDiplomeSelect2.val('').removeAttr('disabled').trigger('change');

            });



        //met à jour les checkbox pour la confidentialité

        updateFields()

    });

</script>
 
 No newline at end of file

module/Soutenance/src/Soutenance/Controller/HDR/Presoutenance/PresoutenanceHDRController.php

+1 −0
Changes for module/Soutenance/src/Soutenance/Controller/HDR/Presoutenance/PresoutenanceHDRController.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ class PresoutenanceHDRController extends PresoutenanceController 
        $pdcData = $this->entityService->fetchInformationsPageDeCouverture($this->entity);

        $exporter = new RapportTechniquePdfExporter($this->renderer, 'A4');

        $exporter->setVars([

            'proposition' => $this->proposition,

            'hdr' => $this->entity,

            'informations' => $pdcData,

        ]);

module/Soutenance/src/Soutenance/Controller/These/Presoutenance/PresoutenanceTheseController.php

+1 −0
Changes for module/Soutenance/src/Soutenance/Controller/These/Presoutenance/PresoutenanceTheseController.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ class PresoutenanceTheseController extends PresoutenanceController 
        $pdcData = $this->entityService->fetchInformationsPageDeCouverture($this->entity);

        $exporter = new RapportTechniquePdfExporter($this->renderer, 'A4');

        $exporter->setVars([

            'proposition' => $this->proposition,

            'these' => $this->entity,

            'informations' => $pdcData,

        ]);

module/Soutenance/view/soutenance/presoutenance/partial/avis-soutenance.phtml

+4 −3
Changes for module/Soutenance/view/soutenance/presoutenance/partial/avis-soutenance.phtml: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -189,11 +189,12 @@ if($proposition->getEtat()->getCode() === Etat::VALIDEE || $proposition->getEtat 


                                    <?php if ($canRevoquerAvisSoutenance && $avi !== null) : ?>

                                        <a  <?php /** @see \Soutenance\Controller\PresoutenanceController::revoquerAvisSoutenanceAction(); */ ?>

                                            href="<?php echo $this->url("soutenance_{$typeProposition}/presoutenance/revoquer-avis-soutenance", ['id' => $object->getId(), 'avis' => $avi->getId()], [], true); ?>">

                                            <span class="icon icon-delete iconly"

                                            href="<?php echo $this->url("soutenance_{$typeProposition}/presoutenance/revoquer-avis-soutenance", ['id' => $object->getId(), 'avis' => $avi->getId()], [], true); ?>"

                                            data-toggle="confirmationx">

                                            <span class="icon icon-delete iconly text-danger"

                                                  data-bs-toggle="tooltip"

                                                  data-bs-html="true"

                                                  title="Révoquer l'avis de soutenance">

                                                  title="Révoquer l'avis de soutenance <br>(Une confirmation avant la suppression vous sera demandée)">

                                            </span>

                                        </a>

                                    <?php else: ?>

module/Soutenance/view/soutenance/presoutenance/partial/engagement-impartialite.phtml

+5 −3
Changes for module/Soutenance/view/soutenance/presoutenance/partial/engagement-impartialite.phtml: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -165,10 +165,12 @@ $canRevoquerEngagementImpartialite = $this->isAllowed($object, EngagementImparti 
                                <?php if ($canRevoquerEngagementImpartialite) : ?>

                                    <?php if ($engagement) : ?>

                                        <a <?php /** @see \Soutenance\Controller\EngagementImpartialiteController::annulerEngagementImpartialiteAction() */ ?>

                                                href="<?php echo $this->url("soutenance_{$typeProposition}/engagement-impartialite/annuler", ['id' => $object->getId(), 'membre' => $rapporteur->getId()], [], true); ?>">

                                        <span class="icon icon-delete iconly"

                                                href="<?php echo $this->url("soutenance_{$typeProposition}/engagement-impartialite/annuler", ['id' => $object->getId(), 'membre' => $rapporteur->getId()], [], true); ?>"

                                                data-toggle="confirmationx">

                                        <span class="icon icon-delete iconly text-danger"

                                              data-bs-toggle="tooltip"

                                              title="Révoquer l'engagement d'impartialité">

                                              data-bs-html="true"

                                              title="Révoquer l'engagement d'impartialité <br>(Une confirmation avant la suppression vous sera demandée)">

                                        </span>

                                        </a>

                                    <?php else: ?>