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

[FIX] Ordonnancement des seance sur les index des formations et des sessions

parent 4b4b1084
Loading
Loading
Loading
Loading
+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Journal des modifications
-----
- Ajout d'une date de fermeture (indicative) pour les sessions de formation
- [FIX] Retrait de la liste complémentaire du mail d'echec
- [FIX] Ordonnancement des seance sur les index des formations et des sessions 

5.2.6
-----
+2 −1
Changes for doc/release-notes/v5.2.7.md: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ git fetch --tags && git checkout --force 5.2.7 && bash ./install.sh
    - php7.4-fpm         : `service php7.4-fpm reload`
    - apache2-mod-php7.4 : `service apache2 reload`


## 2. Dans la base de données

```sql
alter table formation_session add date_fermeture_inscription timestamp;

update role set type_structure_dependant_id=null where code='FORMATEUR';
```
+6 −1
Changes for module/Formation/view/formation/formation/afficher.phtml: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -168,7 +168,12 @@ $canSupprimerSession = $this->isAllowed(SessionPrivileges::getResourceId(Sess
                -
                <?php echo $session->getDuree(); ?> h.
                <ul>
                <?php foreach ($session->getSeances() as $seance) : ?>
                <?php
                /** @var Seance[] $seances */
                $seances = $session->getSeances()->toArray();
                usort($seances, function (Seance $a, Seance $b) { return $a->getDebut() > $b->getDebut();});
                ?>
                <?php foreach ($seances as $seance) : ?>
                    <?php /** @var Seance $seance*/?>
                    <li>
                        <?php echo $seance->getDebut()->format('d/m/Y'); ?>
+6 −2
Changes for module/Formation/view/formation/session/recherche/index.phtml: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -127,8 +127,12 @@ $canSupprimerSession = $this->isAllowed(SessionPrivileges::getResourceId(Sess
                    séance<?php if (count($session->getSeances())>1) echo "s"; ?>
                    (<?php echo $session->getDuree(); ?> h.)
                    <ul>
                        <?php /** @var Seance $seance */ ?>
                        <?php foreach ($session->getSeances() as $seance) : ?>
                        <?php
                            /** @var Seance[] $seances */
                            $seances = $session->getSeances()->toArray();
                            usort($seances, function (Seance $a, Seance $b) { return $a->getDebut() > $b->getDebut();});
                        ?>
                        <?php foreach ($seances as $seance) : ?>
                            <li>
                                <?php echo $seance->getDebut()->format('d/m/Y'); ?>
                                <?php echo $seance->getDebut()->format('H:i') ; ?>