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

Changement de la page de couverture pour tenir compte de la co-accréditation

parent 25cbb7e9

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 
6.0.4

-----

- [FIX] Recherche de rapports d'Activité/CSI/Mi-parcours : les filtres Établissement/ED/UR géraient mal la subsitution de structures.

- Changement de la page de couverture pour tenir compte de la co-accréditation



6.0.3

-----

module/Depot/view/depot/depot/page-de-couverture/pagedecouverture.phtml

+39 −13
Changes for module/Depot/view/depot/depot/page-de-couverture/pagedecouverture.phtml: 39 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -18,16 +18,49 @@ use Application\View\Renderer\PhpRenderer; 
 */

?>



<!-- SECTION DU LOGO DE LA COMUE -------------------------------------------------------------------------------------->

<div style="text-align: center; margin-bottom: 30px;">

    <div class='logo-comue'>

<!-- HEADER NORMAND --------------------------------------------------------------------------------------------------->

<!--

    A GAUCHE  >>> LE LOGO DE LA COMUE

    A DROITE  >>> LE LOGO DE L'ETABLISSEMENT D'INSCRIPTION

-->



<style>

    .logo-header {

        border: 2px hotpink solid;

        max-height: 5cm;

        max-width: 5cm;

    }

</style>



<?php if ($informations->getLogoCOMUE() !== null): ?>

    <table style="border:none;" class="logos">

        <tr>

            <td>

                <?php if ($informations->getLogoCOMUE() !== null): ?>

            <img src="<?php echo $informations->getLogoCOMUE() ?>"/>

                    <img src="<?php echo $informations->getLogoCOMUE() ?>" alt="Logo de la COMUE" class="logo-header"/>

                <?php else: ?>

            <span style='background-color:red;'> COMUE ou logo de la COMUE non renseigné. </span>

                    <span style='background-color:red;'> Logo de la COMUE. </span>

                <?php endif; ?>

            </td>

            <td>

                <?php if ($informations->getLogoEtablissement() !== null): ?>

                    <img src="<?php echo $informations->getLogoEtablissement() ?>" alt="Logo de l'établissement d'inscription" class="logo-header"/>

                <?php else: ?>

                    <span style='background-color:red;'> Logo de l'établissement non renseigné. </span>

                <?php endif; ?>

            </td>

        </tr>

    </table>

<?php else : ?>

    <div class='logo-comue'>

        <?php if ($informations->getLogoEtablissement() !== null): ?>

            <img src="<?php echo $informations->getLogoEtablissement() ?>" alt="Logo de l'établissement d'inscription"/>

        <?php else: ?>

            <span style='background-color:red;'> Logo de l'établissement non renseigné. </span>

        <?php endif; ?>

    </div>

</div>

<?php endif; ?>





<!-- ENTETE DE LA PAGE DE COUVERTURE ---------------------------------------------------------------------------------->

<div class='bandeau-these'>
@@ -139,13 +172,6 @@ use Application\View\Renderer\PhpRenderer; 
<div class="logos">

<table style="border:none;" class="logos">

    <tr>

        <td>

            <?php if ($informations->getLogoEtablissement()): ?>

                <img class="logo_small" src="<?php echo $informations->getLogoEtablissement() ?>"/>

            <?php else: ?>

                <span style='background-color:red;'> Établissement d'inscription ou logo d'établissement non renseigné. </span>

            <?php endif; ?>

        </td>

        <?php if ($informations->isAssocie()): ?>

            <td>

                <?php if ($informations->getLogoAssocie()): ?>

module/Structure/src/Structure/Form/Hydrator/EcoleDoctoraleHydrator.php

+1 −1
Changes for module/Structure/src/Structure/Form/Hydrator/EcoleDoctoraleHydrator.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class EcoleDoctoraleHydrator extends StructureHydrator 
        $theme = (isset($data['theme']) and trim($data['theme']) !== '') ? trim($data['theme']) : null;

        $offreThese = (isset($data['offre-these']) and trim($data['offre-these']) !== '') ? trim($data['offre-these']) : null;



        if ($data['id'] === "") $data['id'] = null;

        if (!isset($data['id']) || $data['id'] === "") $data['id'] = null;



        /** @var EcoleDoctorale $object */

        $object = parent::hydrate($data, $ed);

module/Structure/src/Structure/Form/Hydrator/EtablissementHydrator.php

+1 −1
Changes for module/Structure/src/Structure/Form/Hydrator/EtablissementHydrator.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class EtablissementHydrator extends StructureHydrator 
     */

    public function hydrate(array $data, $etablissement): Etablissement

    {

        if ($data['id'] === "") $data['id'] = null;

        if (!isset($data['id']) || $data['id'] === "") $data['id'] = null;



        /** @var Etablissement $object */

        $object = parent::hydrate($data, $etablissement);

module/Structure/src/Structure/Form/Hydrator/StructureHydrator.php

+1 −1
Changes for module/Structure/src/Structure/Form/Hydrator/StructureHydrator.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ abstract class StructureHydrator extends DoctrineObject 
        $object->getStructure()->setCode($data['code']);

        $object->getStructure()->setIdRef($data['id_ref']);

        $object->getStructure()->setIdHal($data['id_hal']);

        $object->getStructure()->setCheminLogo($data['cheminLogo']);

        $object->getStructure()->setCheminLogo($data['cheminLogo']??null);

        $object->getStructure()->setEstFermee(isset($data['estFerme']) and $data['estFerme'] === "1");



        return $object;