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

Amélioration interface rapporteur

parent 283f5c44

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line 
Journal des modifications

=========================

2.2.2

-----

- Ajout de l'utilisation du module auth-token pour la gestion des rapporteurs 



2.2.1

-----

module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ use UnicaenApp\Exception\LogicException; 
use UnicaenApp\Exception\RuntimeException;

use UnicaenAuth\Service\Traits\UserServiceAwareTrait;

use UnicaenAuthToken\Service\TokenServiceAwareTrait;

use UnicaenAuthToken\Service\TokenServiceException;

use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;

use Zend\View\Model\ViewModel;

use Zend\View\Renderer\PhpRenderer;
@@ -219,7 +220,11 @@ class PresoutenanceController extends AbstractController 


            $token = $this->tokenService->createUserToken($proposition->getDate());

            $token->setUser($user);

            try {

                $this->tokenService->saveUserToken($token);

            } catch (TokenServiceException $e) {

                throw new RuntimeException("Un problème est survenu lors de la création du token", 0,$e);

            }



            $url_rapporteur = $this->url()->fromRoute("soutenance/index-rapporteur", ['these' => $these->getId()], ['force_canonical' => true], true);

            $url = $this->url()->fromRoute('zfcuser/login', ['type'=> 'token'], ['query' => ['token' => $token->getToken(), 'redirect' => $url_rapporteur, 'role' => $acteur->getRole()->getRoleId()], 'force_canonical' => true], true );

module/Soutenance/view/soutenance/avis/afficher.phtml

+20 −0
Original line number Diff line number Diff line
@@ -96,3 +96,23 @@ $canAnnuler = $this->isAllowed(AvisSoutenancePrivileges::getResourceId(AvisSoute 
        Annuler l'avis de soutance

    </a>

<?php endif; ?>



<?php if ($avis !== null AND $avis->estNonHistorise()): ?>

    <div class="box panel panel-success">

        <div class="panel-heading">

            <h2 class="first"> Et ensuite ? </h2>

        </div>

        <div class="panel-body">



            Vous avez maintenant terminé la procédure de pré-soutenance.



        </div>

    </div>

<?php endif; ?>



<div class="pull-right">

    <a href="<?php echo $this->url('soutenance/index-rapporteur', ['these' => $these->getId()], [], true); ?>"

       class="btn btn-primary action">

        Retour à l'index rapporteur

    </a>

</div>

module/Soutenance/view/soutenance/avis/index.phtml

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ $canEdit = $this->isAllowed($rapporteur, AvisSoutenancePrivileges::AVIS_MODIFIER 
    </div>

<?php endif; ?>



<div class="pull-right">

    <a href="<?php echo $this->url('soutenance/index-rapporteur', ['these' => $these->getId()], [], true); ?>"

       class="btn btn-primary action">

        Retour à l'index rapporteur

    </a>

</div>



<style>

    .form-control {

        height: auto;

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

+7 −0
Original line number Diff line number Diff line
@@ -182,3 +182,10 @@ $this->headTitle("Engagement d'impartialité portant sur la thèse de ".$doctora 
    </div>

</div>

<?php endif; ?>



<div class="pull-right">

<a href="<?php echo $this->url('soutenance/index-rapporteur', ['these' => $these->getId()], [], true); ?>"

   class="btn btn-primary action">

   Retour à l'index rapporteur

</a>

</div>
 
 No newline at end of file