diff --git a/module/Application/view/application/index/index-gestionnaire.phtml b/module/Application/view/application/index/index-gestionnaire.phtml index 19761668851356b05acc702ecb1a57a3a63795a6..f46f1f5db461f860c1334f6723ceaa93f8b124d3 100644 --- a/module/Application/view/application/index/index-gestionnaire.phtml +++ b/module/Application/view/application/index/index-gestionnaire.phtml @@ -68,7 +68,7 @@ foreach ($dictionnaireDemande as $etatCode => $demandes) { </div> <?php if (count($sessions) > 0) : ?> <div class="card-body"> - <?php echo $this->formationInstanceArray($sessions, ['affichage' => ['gestionnaires' => false]]); ?> + <?php echo $this->formationInstanceArray($sessions, ['id' => $etatCode, 'affichage' => ['gestionnaires' => false]]); ?> </div> <?php endif; ?> </div> diff --git a/module/Formation/src/Formation/View/Helper/partial/sessions-array.phtml b/module/Formation/src/Formation/View/Helper/partial/sessions-array.phtml index 59a2491b4da474cee40b5c6988a78d7d74ca0f9c..f7ccd7790bad4dfc6ffd68dd80281269dc345f99 100644 --- a/module/Formation/src/Formation/View/Helper/partial/sessions-array.phtml +++ b/module/Formation/src/Formation/View/Helper/partial/sessions-array.phtml @@ -6,10 +6,8 @@ * @var array $options */ - /** Droits pour les actions */ -use Formation\Entity\Db\Seance; use Formation\Entity\Db\Session; use Formation\Provider\Etat\SessionEtats; use Formation\Provider\Privilege\FormationPrivileges; @@ -18,6 +16,8 @@ $displayGestionnaire = true; if (isset($options['affichage']) and isset($options['affichage']['gestionnaires'])) { $displayGestionnaire = $options['affichage']['gestionnaires']; } +$id = (isset($options['id'])) ? $options['id'] : null; + $canAfficherInstance = false; if (!isset($options['droits']) and !isset($options['droits']['afficher'])) { @@ -44,7 +44,7 @@ usort($sessions, function (Session $a, Session $b) { $sessions = array_reverse($sessions); ?> -<table class="datatable table table-condensed" id=""> +<table class="datatable table table-condensed" <?php if ($id) echo 'id="' . $id . '"'; ?>> <thead> <tr> <th> Session</th> @@ -52,7 +52,7 @@ $sessions = array_reverse($sessions); <th> Gestionnaire·s</th> <?php endif; ?> <th> Période</th> <th> #Inscrit</th> - <th> État</th> + <th> État</th> <th class="action"> Action</th> </tr> </thead> @@ -61,8 +61,8 @@ $sessions = array_reverse($sessions); <?php if ($canSupprimerInstance or $instance->estNonHistorise()) : ?> <tr class="<?php if ($instance->estHistorise()) echo " historise "; ?>" style="<?php if (in_array($instance->getEtatActif()->getType()->getCode(), SessionEtats::ETATS_OUVERTS) - AND ($instance->getDateClotureInscription() === null - OR $instance->getDateClotureInscription() < (new DateTime()))) echo 'background: var(--unistrap-color-light)'; ?>" + and ($instance->getDateClotureInscription() === null + or $instance->getDateClotureInscription() < (new DateTime()))) echo 'background: var(--unistrap-color-light)'; ?>" > <td class="identification"> <span class="badge source <?php echo $instance->getSource(); ?>"> @@ -169,6 +169,16 @@ $sessions = array_reverse($sessions); </tbody> </table> -<script> - -</script> +<?php if ($id) : ?> + <script> + $(function () { + $('table#<?php echo $id; ?>').dataTable({ + paging: false, + autoWidth: false, + "language": { + "url": "/js/datatables_fr.json", + }, + }); + }); + </script> +<?php endif; ?> diff --git a/module/Formation/view/formation/session/index.phtml b/module/Formation/view/formation/session/index.phtml index efd9051acbc569fdaccff3c811333f79e4bc85f4..ca99e8893da11995de40579dfe483da5874200a6 100644 --- a/module/Formation/view/formation/session/index.phtml +++ b/module/Formation/view/formation/session/index.phtml @@ -38,7 +38,7 @@ $canVoir = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileg <?php echo $this->messenger()->addMessagesFromFlashMessenger(); ?> -<?php echo $this->formationInstanceArray($instances); ?> +<?php echo $this->formationInstanceArray($instances, ['id' => 'sessions']); ?> <script> $(function() {