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

Rafraichissement en ajax sur la page de proposition de soutenance

parent abf46c23
Loading
Loading
Loading
Loading
+36
Changes for module/Soutenance/config/others/proposition.config.php: 36 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ return [
                    'controller' => PropositionController::class,
                    'action'     => [
                        'proposition',
                        'generate-view-date-lieu',
                        'generate-view-jury',
                        'generate-view-informations',
                    ],
                    'privileges' => PropositionPrivileges::PROPOSITION_VISUALISER,
                ],
@@ -164,6 +167,39 @@ return [
                            ],
                        ],
                        'child_routes' => [
                            'generate-view-date-lieu' => [
                                'type' => Segment::class,
                                'may_terminate' => true,
                                'options' => [
                                    'route'    => '/generate-view-date-lieu',
                                    'defaults' => [
                                        'controller' => PropositionController::class,
                                        'action'     => 'generate-view-date-lieu',
                                    ],
                                ],
                            ],
                            'generate-view-jury' => [
                                'type' => Segment::class,
                                'may_terminate' => true,
                                'options' => [
                                    'route'    => '/generate-view-jury',
                                    'defaults' => [
                                        'controller' => PropositionController::class,
                                        'action'     => 'generate-view-jury',
                                    ],
                                ],
                            ],
                            'generate-view-informations' => [
                                'type' => Segment::class,
                                'may_terminate' => true,
                                'options' => [
                                    'route'    => '/generate-view-informations',
                                    'defaults' => [
                                        'controller' => PropositionController::class,
                                        'action'     => 'generate-view-informations',
                                    ],
                                ],
                            ],
                            'sursis' => [
                                'type' => Literal::class,
                                'may_terminate' => true,
+62
Changes for module/Soutenance/src/Soutenance/Controller/Proposition/PropositionController.php: 62 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ use Soutenance\Form\Membre\MembreForm;
use Soutenance\Form\Membre\MembreFromAwareTrait;
use Soutenance\Form\Refus\RefusForm;
use Soutenance\Form\Refus\RefusFormAwareTrait;
use Soutenance\Provider\Privilege\PropositionPrivileges;
use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait;
use Soutenance\Service\Membre\MembreServiceAwareTrait;
use Soutenance\Service\Notifier\NotifierSoutenanceServiceAwareTrait;
@@ -119,6 +120,67 @@ class PropositionController extends AbstractController {
        ]);
    }

    public function generateViewDateLieuAction()
    {
        $these = $this->requestedThese();
        $proposition = $this->getPropositionService()->findByThese($these);
        $parametres = $this->getParametreService()->getParametresAsArray();

        $vm = new ViewModel();
        $vm->setTerminal(true);
        $vm->setVariables([
           'these' => $these,
           'proposition' => $proposition,
           'FORMULAIRE_DELOCALISATION' => $parametres[Parametre::CODE_FORMULAIRE_DELOCALISATION],
           'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
        ]);
        return $vm;
    }

    public function generateViewJuryAction()
    {
        $these = $this->requestedThese();
        $proposition = $this->getPropositionService()->findByThese($these);
        $parametres = $this->getParametreService()->getParametresAsArray();

        /** Indicateurs --------------------------------------------------------------------------------------------- */
        $indicateurs = $this->getPropositionService()->computeIndicateur($proposition);
        $juryOk = $this->getPropositionService()->juryOk($proposition, $indicateurs);
        if ($juryOk === false) $indicateurs["valide"] = false;
        $isOk = $this->getPropositionService()->isOk($proposition, $indicateurs);

        $vm = new ViewModel();
        $vm->setTerminal(true);
        $vm->setVariables([
            'these' => $these,
            'proposition' => $proposition,
            'FORMULAIRE_DELEGUATION' => $parametres[Parametre::CODE_FORMULAIRE_DELEGUATION],
            'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
            'indicateurs' => $indicateurs,
        ]);
        return $vm;
    }

    public function generateViewInformationsAction()
    {
        $these = $this->requestedThese();
        $proposition = $this->getPropositionService()->findByThese($these);
        $parametres = $this->getParametreService()->getParametresAsArray();


        $vm = new ViewModel();
        $vm->setTerminal(true);
        $vm->setVariables([
            'these' => $these,
            'proposition' => $proposition,
            'FORMULAIRE_DEMANDE_LABEL' => $parametres[Parametre::CODE_FORMULAIRE_LABEL_EUROPEEN],
            'FORMULAIRE_DEMANDE_ANGLAIS' => $parametres[Parametre::CODE_FORMULAIRE_THESE_ANGLAIS],
            'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $parametres[Parametre::CODE_FORMULAIRE_CONFIDENTIALITE],
            'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
        ]);
        return $vm;
    }

    public function modifierDateLieuAction()
    {
        $these = $this->requestedThese();
+20
Changes for module/Soutenance/view/soutenance/proposition/generate-view-date-lieu.phtml: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

use Soutenance\Entity\Proposition;

/**
 * @see \Soutenance\Controller\Proposition\PropositionController::generateViewDateLieuAction()
 *
 * @var Proposition $proposition
 * @var boolean $canModifier
 * @var string $FORMULAIRE_DELOCALISATION
 */

?>

<?php
echo $this->partial('partial/date-et-lieu', [
    'proposition' => $proposition,
    'canModifier' => $canModifier,
    'FORMULAIRE_DELOCALISATION' => $FORMULAIRE_DELOCALISATION]);
?>
 No newline at end of file
+24
Changes for module/Soutenance/view/soutenance/proposition/generate-view-informations.phtml: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

use Soutenance\Entity\Proposition;

/**
 * @see \Soutenance\Controller\Proposition\PropositionController::generateViewDateLieuAction()
 *
 * @var Proposition $proposition
 * @var boolean $canModifier
 * @var string $FORMULAIRE_DEMANDE_LABEL
 * @var string $FORMULAIRE_DEMANDE_ANGLAIS
 * @var string $FORMULAIRE_DEMANDE_CONFIDENTIALITE
 */

?>

<?php
echo $this->partial('partial/informations-complementaires', [
    'proposition' => $proposition,
    'canModifier' => $canModifier,
    'FORMULAIRE_DEMANDE_LABEL' => $FORMULAIRE_DEMANDE_LABEL,
    'FORMULAIRE_DEMANDE_ANGLAIS' => $FORMULAIRE_DEMANDE_ANGLAIS,
    'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $FORMULAIRE_DEMANDE_CONFIDENTIALITE]);
?>
 No newline at end of file
+22
Changes for module/Soutenance/view/soutenance/proposition/generate-view-jury.phtml: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

use Soutenance\Entity\Proposition;

/**
 * @see \Soutenance\Controller\Proposition\PropositionController::generateViewDateLieuAction()
 *
 * @var Proposition $proposition
 * @var boolean $canModifier
 * @var array $indicateurs
 * @var string $FORMULAIRE_DELEGUATION
 */

?>

<?php
echo $this->partial('partial/composition-jury', [
    'proposition' => $proposition,
    'indicateurs' => $indicateurs,
    'canModifier' => $canModifier,
    'FORMULAIRE_DELEGUATION' => $FORMULAIRE_DELEGUATION]);
?>
Loading