From 17b76e1a0f3228102c703dd50e4dced677419766 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Sun, 11 Feb 2024 17:53:56 +0100
Subject: [PATCH] =?UTF-8?q?1.4.26=20Gestion=20des=20utilisateurs=20date=20?=
 =?UTF-8?q?de=20la=20derni=C3=A8re=20page=20vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/course/course.php              | 2 +-
 core/module/course/view/users/users.js.php | 2 +-
 core/module/course/view/users/users.php    | 2 +-
 core/module/user/user.php                  | 4 +++-
 core/module/user/view/index/index.js.php   | 2 +-
 core/module/user/view/index/index.php      | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/module/course/course.php b/core/module/course/course.php
index 22b2ca3..e9a11d5 100644
--- a/core/module/course/course.php
+++ b/core/module/course/course.php
@@ -668,7 +668,7 @@ class course extends common
 
                 // Construction du tableau
                 self::$courseUsers[] = [
-                    $userId,
+                    //$userId,
                     $this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']),
                     isset($pages[$this->getData(['enrolment', $courseId, $userId, 'lastPageView'])]['title'])
                     ? $pages[$this->getData(['enrolment', $courseId, $userId, 'lastPageView'])]['title']
diff --git a/core/module/course/view/users/users.js.php b/core/module/course/view/users/users.js.php
index d2d416b..be7188e 100644
--- a/core/module/course/view/users/users.js.php
+++ b/core/module/course/view/users/users.js.php
@@ -30,7 +30,7 @@ $(document).ready((function () {
         locale: 'fr',
         "columnDefs": [
             {
-                target: 7,
+                target: 6,
                 orderable: false,
                 searchable: false
             }
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php
index 2b5db59..1409955 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, 2, 3, 1, 1, 1 , 1, 1], $module::$courseUsers, ['Id', 'Nom Prénom', 'Dernière page vue', 'Date' , 'Heure', 'Étiquettes', 'Progression', ''], ['id' => 'dataTables']); ?>
+    <?php echo template::table([3, 4, 1, 1, 1, 1, 1], $module::$courseUsers, ['Nom Prénom', 'Dernière page vue', 'Date' , 'Heure', 'Étiquettes', 'Progression', ''], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun participant'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 84f5ffb..6d6138a 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -518,13 +518,15 @@ class user extends common
 
 				// Formatage de la liste
 				self::$users[] = [
-					$userId,
+					//$userId,
 					$this->getData(['user', $userId, 'firstname']) . ' ' . $userLastNames,
 					helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]),
 					empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']))
 					? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])])
 					: $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']),
 					$this->getData(['user', $userId, 'tags']),
+				    helper::dateUTF8('%d/%m/%Y', $this->getData(['user', $userId, 'accessTimer']), self::$i18nUI),
+					//helper::dateUTF8('%H:%M', $this->getData(['user', $userId, 'accessTimer']), self::$i18nUI),
 					template::button('userEdit' . $userId, [
 						'href' => helper::baseUrl() . 'user/edit/' . $userId,
 						'value' => template::ico('pencil'),
diff --git a/core/module/user/view/index/index.js.php b/core/module/user/view/index/index.js.php
index 0f1ed3b..373e136 100644
--- a/core/module/user/view/index/index.js.php
+++ b/core/module/user/view/index/index.js.php
@@ -22,7 +22,7 @@ $(document).ready((function () {
     $("#userFilterGroup, #userFilterFirstName, #userFilterLastName").change(function () {
         $("#userFilterUserForm").submit();
     });
-
+    $.fn.dataTable.moment( 'DD/MM/YYYY' );
     $('#dataTables').DataTable({
         language: {
             url: "core/vendor/datatables/french.json"
diff --git a/core/module/user/view/index/index.php b/core/module/user/view/index/index.php
index 22934c1..cf44cb4 100644
--- a/core/module/user/view/index/index.php
+++ b/core/module/user/view/index/index.php
@@ -60,4 +60,4 @@
 	</div>
 </div>
 <?php echo template::formClose(); ?>
-<?php echo template::table([2, 2, 2, 2, 2, 1, 1], $module::$users, ['Identifiant', 'Nom', 'Groupe', 'Profil', 'Étiquettes',  '', ''], ['id' => 'dataTables']); ?>
\ No newline at end of file
+<?php echo template::table([3, 2, 2, 2, 2, 1, 1], $module::$users, [ 'Nom', 'Groupe', 'Profil', 'Étiquettes', 'Date dernière vue', '', ''], ['id' => 'dataTables']); ?>
\ No newline at end of file