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

[FIX] Plus de demande de justificatif pour la confidentialité si la demande... 

[FIX] Plus de demande de justificatif pour la confidentialité si la demande est faite en amont de la soutenance
parent 7523cbfd

CHANGELOG.md

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

-----

- Ajout d'une valeur d'état aux soutenances "Validée par l'établissement" post validation d'une soutenance par la présidence de l'établissement

- [FIX] Plus de demande de justificatif pour la confidentialité si la demande est faite en amont de la soutenance



3.0.1

-----

module/Soutenance/src/Soutenance/Controller/PropositionController.php

+2 −1
Changes for module/Soutenance/src/Soutenance/Controller/PropositionController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -323,10 +323,11 @@ class PropositionController extends AbstractController 
        }



        $vm = new ViewModel();

        $vm->setTemplate('soutenance/default/default-form');

        $vm->setTemplate('soutenance/proposition/confidentialite');

        $vm->setVariables([

            'title' => 'Renseignement des informations relatives à la confidentialité',

            'form' => $form,

            'these' => $these,

        ]);

        return $vm;

    }

module/Soutenance/src/Soutenance/Form/Confidentialite/ConfidentialiteHydrator.php

+9 −6
Changes for module/Soutenance/src/Soutenance/Form/Confidentialite/ConfidentialiteHydrator.php: 9 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -15,14 +15,17 @@ class ConfidentialiteHydrator implements HydratorInterface 
     */

    public function hydrate(array $data, $proposition) {



        if ($data['date']) {

        $date = null;

        $huisclos = false;

        if ($data['date'] and $proposition->getThese()->getDateFinConfidentialite() === null) {

            $date = DateTime::createFromFormat("Y-m-d", $data['date']);

            $proposition->setConfidentialite($date);

            $proposition->setHuitClos($data['huitclos']);

        } else {

            $proposition->setConfidentialite(null);

            $proposition->setHuitClos(false);

        }

        if ($data['date'] OR $proposition->getThese()->getDateFinConfidentialite() !== null) {

            $huisclos = $data['huitclos']??false;

        }



        $proposition->setConfidentialite($date);

        $proposition->setHuitClos($huisclos);



        return $proposition;

    }

module/Soutenance/src/Soutenance/Service/Justificatif/JustificatifService.php

+2 −2
Changes for module/Soutenance/src/Soutenance/Service/Justificatif/JustificatifService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ class JustificatifService { 
    /**

     * @param AbstractActionController $controller

     * @param string $paramName

     * @return Justificatif

     * @return Justificatif|null

     */

    public function getRequestedJustificatif($controller, $paramName = 'justificatif')

    public function getRequestedJustificatif(AbstractActionController $controller, string $paramName = 'justificatif') : ?Justificatif

    {

        $id = $controller->params()->fromRoute($paramName);

        $justificatif = $this->getJustificatif($id);

module/Soutenance/view/soutenance/proposition/confidentialite.phtml

0 → 100644
+22 −0
Changes for module/Soutenance/view/soutenance/proposition/confidentialite.phtml: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php

/**

 * @see \Soutenance\Controller\PropositionController::confidentialiteAction()

 * @var ConfidentialiteForm $form

 * @var These $these

 */



use Application\Entity\Db\These;

use Soutenance\Form\Confidentialite\ConfidentialiteForm;



?>



<?php

    echo $this->form()->openTag($form);

    if ($these->getDateFinConfidentialite() === null) {

        echo $this->formControlGroup()->render($form->get('date'));

    }

    echo $this->formControlGroup()->render($form->get('huitclos'));

    echo $this->formControlGroup()->render($form->get('submit'));

    echo $this->form()->closeTag();

?>