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

Amélioration rendu des convocation

parent 86c3b05f
Loading
Loading
Loading
Loading
+21 −4
Changes for module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_doctorant.phtml: 21 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -35,6 +35,25 @@ $civilite = ($these->getDoctorant()->getIndividu()->getCivilite() === 'M.')?"Mon

</style>

<div style="width:25%; float:left; position:absolute; top: 20px; left: 20px">
    <?php if ($informations->getLogoCOMUE() !== null): ?>
        <img src="<?php echo $informations->getLogoCOMUE() ?>" />
    <?php else : ?>
        <span style='background-color:red;'>
                Logo COMUE manquant
            </span>
    <?php endif; ?>
</div>
<div style="width:25%; float:right; position:absolute; top: 20px; right: 20px ">
    <?php if ($informations->getLogoEtablissement() !== null): ?>
        <img src="<?php echo $informations->getLogoEtablissement() ?>" />
    <?php else : ?>
        <span style='background-color:red;'>
                Logo ETAB manquant
        </span>
    <?php endif; ?>
</div>

<br/>
<br/>
<br/>
@@ -42,13 +61,11 @@ $civilite = ($these->getDoctorant()->getIndividu()->getCivilite() === 'M.')?"Mon

<table>
    <tr>
        <td width="70%"></td>
        <td width="80%"></td>
        <td>
            À <?php echo $ville; ?>, le <?php echo $date->format('d/m/Y'); ?>
            <br/>
            <br/>
            <?php echo $these->getDoctorant()->getIndividu()->getNomComplet(true); ?> <br/>
<!--            <span class="not-yet">ADRESSE PERSONNELLE</span> <br/>-->
        </td>
    </tr>
</table>
@@ -59,7 +76,7 @@ $civilite = ($these->getDoctorant()->getIndividu()->getCivilite() === 'M.')?"Mon
<br/>

<p>
    <?php echo $civilite ?>, <br/>
    <?php echo $civilite ?> <?php echo $these->getDoctorant()->getNomComplet(); ?>, <br/>
</p>

    Par décision en date du
+23 −4
Changes for module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_membre.phtml: 23 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -43,6 +43,27 @@ if ($membre->getIndividu()) $denomination = $membre->getIndividu()->getNomComple

</style>

<div style="width:25%; float:left; position:absolute; top: 20px; left: 20px">
    <?php if ($informations->getLogoCOMUE() !== null): ?>
        <img src="<?php echo $informations->getLogoCOMUE() ?>" />
    <?php else : ?>
        <span style='background-color:red;'>
                Logo COMUE manquant
            </span>
    <?php endif; ?>
</div>
<div style="width:25%; float:right; position:absolute; top: 20px; right: 20px ">
    <?php if ($informations->getLogoEtablissement() !== null): ?>
        <img src="<?php echo $informations->getLogoEtablissement() ?>" />
    <?php else : ?>
        <span style='background-color:red;'>
                Logo ETAB manquant
        </span>
    <?php endif; ?>
</div>

<br/>
<br/>
<br/>
<br/>
<br/>
@@ -50,12 +71,10 @@ if ($membre->getIndividu()) $denomination = $membre->getIndividu()->getNomComple

<table>
    <tr>
        <td width="70%"></td>
        <td width="80%"></td>
        <td>
            À <?php echo $ville; ?>, le <?php echo $date->format('d/m/Y'); ?>
            <br/>
            <br/>
            <?php echo $denomination; ?> <br/>
<!--            <span class="not-yet">ADRESSE ETABLISSEMENT RATTACHEMENT</span> <br/>-->
        </td>
    </tr>
@@ -67,7 +86,7 @@ if ($membre->getIndividu()) $denomination = $membre->getIndividu()->getNomComple
<br/>

<p>
    <?php echo $civilite ?>, <br/>
    <?php echo $civilite ?>  <?php echo $denomination; ?>, <br/>
</p>

Par décision en date du
+3
Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ class NotifierSoutenanceService extends NotifierService {
    {
        if ($email === null) throw new LogicException("Aucun mail n'est fourni pour l'envoi de la convocation.",0);

        $pdcData = $this->getTheseService()->fetchInformationsPageDeCouverture($these);

        $notif = new Notification();
        $notif
            ->setSubject("Convocation pour la soutenance de thèse de  " . $doctorant->getNomComplet())
@@ -678,6 +680,7 @@ class NotifierSoutenanceService extends NotifierService {
                'doctorant' => $doctorant,
                'date' => $date,
                'url' => $url,
                'informations' => $pdcData,
            ]);
        $this->trigger($notif);
    }