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

Merge branch 'hotfix_mail_rapporteur_depuis_membre' into develop

parents be32b907 25c3d5ad

module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ class NotifierSoutenanceService extends NotifierService 
     */

    public function triggerDemandeSignatureEngagementImpartialite($these, $proposition, $membre)

    {

        $email = $membre->getIndividu()->getEmail();

        $email = $membre->getEmail();



        if ($email !== null) {

            $notif = new Notification();
@@ -399,7 +399,7 @@ class NotifierSoutenanceService extends NotifierService 
     */

    public function triggerAnnulationEngagementImpartialite($these, $proposition, $membre)

    {

        $email = $membre->getIndividu()->getEmail();

        $email = $membre->getEmail();



        if ($email) {

            $notif = new Notification();
@@ -423,7 +423,7 @@ class NotifierSoutenanceService extends NotifierService 
     */

    public function triggerDemandeAvisSoutenance($these, $proposition, $rapporteur)

    {

        $email = $rapporteur->getIndividu()->getEmail();

        $email = $rapporteur->getEmail();



        if ($email !== null) {

            $notif = new Notification();

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ $tousLesAvis = count($rapporteurs) === count($avis) ; 
                            <?php if ($canNotifierAvisSoutenance && isset($engagements[$rapporteur->getIndividu()->getId()]) && !isset($avis[$acteur->getIndividu()->getId()])) : ?>

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

                                    href="<?php echo $this->url('soutenance/presoutenance/notifier-demande-avis-soutenance', ['these' => $these->getId(), 'membre' => $rapporteur->getId()], [], true); ?>">

                                    <span class="glyphicon glyphicon-send"      title="Notifier le rapporteur"></span>

                                    <span class="glyphicon glyphicon-send"      title="Notifier le rapporteur '<?php echo $rapporteur->getEmail(); ?>'"></span>

                                </a>

                            <?php else: ?>

                                <span class="glyphicon glyphicon-send" title="Notifier le rapporteur" style="color:lightgray;" ></span>

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

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ $canRevoquerEngagementImpartialite = $this->isAllowed($these, EngagementImpa 
                    <!-- Signature ------------------------------------------------------------------------------------>

                    <td>

                        <?php if ($acteur !== null) : ?>

                            <?php if ($acteur->getIndividu()->getEmail() !== null) : ?>

                            <?php if ($acteur->getMembre()->getEmail() !== null) : ?>

                                <?php if ($engagement !== null): ?>

                                    <?php

                                        echo $engagement->getHistoCreation()->format(Constants::DATETIME_FORMAT);
@@ -99,7 +99,7 @@ $canRevoquerEngagementImpartialite = $this->isAllowed($these, EngagementImpa 


                    <!-- Actions -------------------------------------------------------------------------------------->

                    <td>

                        <?php if ($acteur !== null AND $acteur->getIndividu()->getEmail() !== null) : ?>

                        <?php if ($acteur !== null AND $acteur->getMembre()->getEmail() !== null) : ?>



                            <?php if($canNotifierEngagementImpartialite) : ?>

                                <?php if ($engagement) : ?>
@@ -108,7 +108,7 @@ $canRevoquerEngagementImpartialite = $this->isAllowed($these, EngagementImpa 
                                    <a

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

                                        href="<?php echo $this->url('soutenance/engagement-impartialite/notifier', ['these' => $these->getId(), 'proposition' => $proposition->getId(), 'membre' => $rapporteur->getId()], [], true);?>">

                                        <span class="glyphicon glyphicon-send" title="Notifier le rapporteur"></span>

                                        <span class="glyphicon glyphicon-send" title="Notifier le rapporteur '<?php echo $acteur->getMembre()->getEmail(); ?>'"></span>

                                    </a>

                                <?php endif; ?>

                            <?php endif; ?>