From 9bf135337efda11b63294926b0a11344a79cd053 Mon Sep 17 00:00:00 2001
From: F TEMPEZ <frederic.tempez@outlook.com>
Date: Tue, 13 Feb 2024 08:43:09 +0100
Subject: [PATCH] 1.5.02 - graph page name - graph time - graph shit first time
 range

---
 README.md                                              | 2 +-
 core/core.php                                          | 2 +-
 core/module/course/course.php                          | 5 +++++
 core/module/course/view/userHistory/userHistory.js.php | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d69aaeb..da3ff6c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ZwiiCampus 1.5.01
+# ZwiiCampus 1.5.02
 
 ZwiiCampus (Learning Management System) est logiciel auteur destiné à mettre en ligne des tutoriels. Il dispose de plusieurs modalités d'ouverture et d'accès des contenus. Basé sur la version 13 du CMS Zwii, la structure logicielle est solide, le framework de Zwii est éprouvé.
 
diff --git a/core/core.php b/core/core.php
index 3c34e74..672efde 100644
--- a/core/core.php
+++ b/core/core.php
@@ -51,7 +51,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.5.01';
+	const ZWII_VERSION = '1.5.02';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
diff --git a/core/module/course/course.php b/core/module/course/course.php
index 1f0b4b1..cbdd71e 100644
--- a/core/module/course/course.php
+++ b/core/module/course/course.php
@@ -1212,6 +1212,7 @@ class course extends common
                     self::$userGraph[] = [
                         helper::dateUTF8('%Y-%m-%d %H:%M:%S', $time),
                         $diff,
+                        html_entity_decode($pages[$pageId]['title']) . ' ('. helper::dateUTF8('%M\'%S"', $diff) . ')'
                     ];
                 }
                 $lastView = $time;
@@ -1224,6 +1225,10 @@ class course extends common
         for ($i = 0; $i < count(self::$userHistory) - 1; $i++) {
             self::$userHistory[$i][2] = self::$userHistory[$i + 1][2];
         }
+        // Décale les temps de consultation
+        for ($i = 0; $i < count(self::$userGraph) - 1; $i++) {
+            self::$userHistory[$i][1] = self::$userHistory[$i + 1][1];
+        }
 
         // Formate le timestamp
         array_walk(self::$userHistory, function (&$item) {
diff --git a/core/module/course/view/userHistory/userHistory.js.php b/core/module/course/view/userHistory/userHistory.js.php
index 2fef9b2..b80317d 100644
--- a/core/module/course/view/userHistory/userHistory.js.php
+++ b/core/module/course/view/userHistory/userHistory.js.php
@@ -15,10 +15,12 @@ $(document).ready((function () {
 
     var dataX = <?php echo json_encode(array_map(function ($item) { return $item[0]; }, $module::$userGraph)); ?>;
     var dataY = <?php echo json_encode(array_map(function ($item) { return $item[1];}, $module::$userGraph)); ?>;
+    var dataText = <?php echo json_encode(array_map(function ($item) { return $item[2];}, $module::$userGraph)); ?>;
 
     var data = [{
         x: dataX,
         y: dataY,
+        text: dataText,
         mode: 'markers', // Mode de tracé des points
         type: 'scatter' // Type de graphe
     }];