From ad578028d70ee17978e529c843b297585ccc041b Mon Sep 17 00:00:00 2001
From: F TEMPEZ <frederic.tempez@outlook.com>
Date: Thu, 30 Nov 2023 14:12:03 +0100
Subject: [PATCH] =?UTF-8?q?Filtre=20de=20d=C3=A9sinscription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/course/course.php                       | 9 +++++++--
 core/module/course/view/users/users.php             | 2 +-
 core/module/course/view/usersAdd/usersAdd.php       | 2 +-
 core/module/course/view/usersDelete/usersDelete.php | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/module/course/course.php b/core/module/course/course.php
index f47a09e..829acde 100644
--- a/core/module/course/course.php
+++ b/core/module/course/course.php
@@ -491,8 +491,10 @@ class course extends common
                 $pageId = array_search($maxTime, $history);
             }
 
-            // Compte les rôles
-            $profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])]++;
+            // Compte les rôles valides
+            if (isset($profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])])) {
+                $profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])]++;
+            }
 
             // Filtres
             if ($this->isPost()) {
@@ -529,6 +531,7 @@ class course extends common
                 $this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']),
                 !empty($history) ? $pages[$pageId] : '-',
                 !empty($history) ? helper::dateUTF8('%d %B %Y - %H:%M', $maxTime) : '-',
+                $this->getData(['user', $userId, 'tags']),
                 template::button('userHistory' . $userId, [
                     'href' => helper::baseUrl() . 'course/userHistory/' . $courseId . '/' . $userId,
                     'value' => !empty($history) ? round(($viewPages * 100) / $sumPages, 1) . ' %' : '0%',
@@ -660,6 +663,7 @@ class course extends common
                 $userId,
                 $this->getData(['user', $userId, 'firstname']),
                 $this->getData(['user', $userId, 'lastname']),
+                $this->getData(['user', $userId, 'tags']),
             ];
 
         }
@@ -804,6 +808,7 @@ class course extends common
                 $userId,
                 $this->getData(['user', $userId, 'firstname']),
                 $this->getData(['user', $userId, 'lastname']),
+                $this->getData(['user', $userId, 'tags']),
             ];
 
         }
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php
index 177ffbf..b18af8a 100644
--- a/core/module/course/view/users/users.php
+++ b/core/module/course/view/users/users.php
@@ -53,7 +53,7 @@
 </div>
 <?php echo template::formClose(); ?>
 <?php if ($module::$courseUsers): ?>
-    <?php echo template::table([2, 3, 3, 2, 1, 1], $module::$courseUsers, ['Id', 'Nom Prénom', 'Dernière page vue', 'Date - Heure', 'Progression', ''], ['id' => 'dataTables']); ?>
+    <?php echo template::table([1, 1, 3, 3, 2, 1, 1], $module::$courseUsers, ['Id', 'Nom Prénom', 'Dernière page vue', 'Date - Heure', 'Etiquette', 'Progression', ''], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/course/view/usersAdd/usersAdd.php b/core/module/course/view/usersAdd/usersAdd.php
index a9b4980..e21f250 100644
--- a/core/module/course/view/usersAdd/usersAdd.php
+++ b/core/module/course/view/usersAdd/usersAdd.php
@@ -44,7 +44,7 @@
     </div>
 </div>
 <?php if ($module::$courseUsers): ?>
-    <?php echo template::table([1, 4, 4, 3], $module::$courseUsers, ['', 'Id', 'Prénom', 'Nom'], ['id' => 'dataTables']); ?>
+    <?php echo template::table([1, 2, 3, 3, 3], $module::$courseUsers, ['', 'Id',  'Prénom', 'Nom', 'Etiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>
diff --git a/core/module/course/view/usersDelete/usersDelete.php b/core/module/course/view/usersDelete/usersDelete.php
index e303d50..9d77345 100644
--- a/core/module/course/view/usersDelete/usersDelete.php
+++ b/core/module/course/view/usersDelete/usersDelete.php
@@ -45,7 +45,7 @@
     </div>
 </div>
 <?php if ($module::$courseUsers): ?>
-    <?php echo template::table([1, 4, 4, 3], $module::$courseUsers, ['', 'Id',  'Prénom', 'Nom'], ['id' => 'dataTables']); ?>
+    <?php echo template::table([1, 2, 3, 3, 3], $module::$courseUsers, ['', 'Id',  'Prénom', 'Nom', 'Etiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>