Merge branch 'release_1.0.6'

config/application.config.php

@@ -41,6 +41,7 @@ $modules = [
     'Unicaen\Console',
     'UnicaenSynchro',
 
+
     'Agent',
     'Structure',
     'Carriere',
@@ -49,6 +50,7 @@ $modules = [
     'DemandeExterne',
     'Fichier',
     'Application',
+
 //    'Laminas\DeveloperTools',
 
 ];

database/migration-script/1.0.6.sql

+-- nouveaux privileges
+INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
+WITH d(code, lib, ordre) AS (
+    SELECT 'export_index', 'Accéder à l''index des exportations', 10
+)
+SELECT cp.id, d.code, d.lib, d.ordre
+FROM d
+JOIN unicaen_privilege_categorie cp ON cp.CODE = 'demandeexterne';
\ No newline at end of file

module/Formation/config/merged/export.config.php

@@ -4,6 +4,7 @@ namespace Formation;
 
 use Formation\Controller\ExportController;
 use Formation\Controller\ExportControllerFactory;
+use Formation\Provider\Privilege\ExportPrivileges;
 use Laminas\Router\Http\Literal;
 use Laminas\Router\Http\Segment;
 use UnicaenPrivilege\Guard\PrivilegeController;
@@ -18,7 +19,8 @@ return [
                         'index',
                         'extraction-inscription',
                     ],
-                    'roles' => [
+                    'privileges' => [
+                        ExportPrivileges::EXPORT_INDEX,
                     ],
                 ],
             ],

module/Formation/src/Formation/Provider/Privilege/ExportPrivileges.php

+<?php
+
+namespace Formation\Provider\Privilege;
+
+use UnicaenPrivilege\Provider\Privilege\Privileges;
+
+class ExportPrivileges extends Privileges
+{
+    const EXPORT_INDEX = 'export-export_index';
+}

module/Formation/src/Formation/View/Helper/partial/sessions-array.phtml

@@ -8,7 +8,9 @@
 
 /** Droits pour les actions */
 
+use Formation\Entity\Db\Inscription;
 use Formation\Entity\Db\Session;
+use Formation\Provider\Etat\InscriptionEtats;
 use Formation\Provider\Etat\SessionEtats;
 use Formation\Provider\Privilege\FormationPrivileges;
 
@@ -50,7 +52,7 @@ $sessions = array_reverse($sessions);
         <th> Session</th>
         <?php if ($displayGestionnaire) : ?>
             <th> Gestionnaire·s</th> <?php endif; ?>
-        <th> Période</th>
+        <th data-type="number"> Période</th>
         <th> #Inscrit</th>
         <th> État</th>
         <th class="action"> Action</th>
@@ -89,7 +91,7 @@ $sessions = array_reverse($sessions);
                         <?php endif; ?>
                     </td>
                 <?php endif; ?>
-                <td class="periode">
+                <td class="periode" data-order="<?php echo ($instance->getDebut(true))?$instance->getDebut(true)->getTimestamp():PHP_INT_MAX; ?>">
                     <?php echo $instance->getPeriode(); ?> <br>
                     <strong> Clôture des inscriptions </strong>
                     <?php if ($instance->getDateClotureInscription()) : ?>
@@ -101,7 +103,12 @@ $sessions = array_reverse($sessions);
                 </td>
                 <td class="listes">
                     <?php if ($instance->getInscriptions()) : ?>
-                        Inscription : <?php echo count($instance->getInscriptions()); ?><br>
+                        <?php
+                        $inscriptions = $instance->getInscriptions();
+                        $inscriptions = array_filter($inscriptions, function (Inscription $inscription) { return $inscription->estNonHistorise();});
+                        $inscriptions = array_filter($inscriptions, function (Inscription $inscription) { return !$inscription->isEtatActif(InscriptionEtats::ETAT_DESISTEMENT);});
+                        ?>
+                        Inscription : <?php echo count($inscriptions); ?><br>
                         <?php if ($instance->getNbPlacePrincipale() === 0): ?>
                             Pas de liste principale
                         <?php else : ?>

module/Formation/view/formation/session/partial/inscrits.phtml

@@ -5,7 +5,9 @@
  */
 
 use Agent\Provider\Privilege\AgentPrivileges;
+use Formation\Entity\Db\Inscription;
 use Formation\Entity\Db\Session;
+use Formation\Provider\Etat\InscriptionEtats;
 use Formation\Provider\Etat\SessionEtats;
 use Formation\Provider\Privilege\FormationinstancefraisPrivileges;
 use Formation\Provider\Privilege\FormationinstancePrivileges;
@@ -40,7 +42,9 @@ $canNotifierInscrit = $this->isAllowed(FormationinstancePrivileges::getResourceI
 $liste = $instance->getListeDisponible();
 $principaleComplete = $instance->isListePrincipaleComplete();
 $complementaireComplete = $instance->isListeComplementaireComplete();
-$inscriptions = $instance->getInscriptions()
+$inscriptions = $instance->getInscriptions();
+$inscriptions = array_filter($inscriptions, function (Inscription $inscription) { return $inscription->estNonHistorise();});
+$inscriptions = array_filter($inscriptions, function (Inscription $inscription) { return !$inscription->isEtatActif(InscriptionEtats::ETAT_DESISTEMENT);});
 
 
 ?>