From b88e99e31dd7110970d4125dc494292829e5e73e Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 18 Oct 2023 14:37:33 +0200 Subject: [PATCH] v44 format de l'historique --- core/core.php | 2 +- core/module/course/course.php | 3 ++- core/module/course/view/userHistory/userHistory.js.php | 6 +++++- core/module/course/view/userHistory/userHistory.php | 6 +++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/core/core.php b/core/core.php index 2f45c1e..4810afd 100644 --- a/core/core.php +++ b/core/core.php @@ -50,7 +50,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.0.43'; + const ZWII_VERSION = '1.0.44'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/lms/'; diff --git a/core/module/course/course.php b/core/module/course/course.php index c39eac6..1fdce63 100644 --- a/core/module/course/course.php +++ b/core/module/course/course.php @@ -672,10 +672,11 @@ class course extends common $courseId = $this->getUrl(2); $userId = $this->getUrl(3); $history = $this->getData(['enrolment', $courseId, $userId]); + $pages = json_decode(file_get_contents(self::DATA_DIR . $courseId . '/page.json'), true); foreach ($history['history'] as $pageId => $time) { self::$userHistory[$pageId] = [ helper::dateUTF8('%d %B %Y - %H:%M:%S', $time), - $this->getData(['page', $pageId, 'shortTitle']), + $pages['page'][$pageId]['shortTitle'], ]; } diff --git a/core/module/course/view/userHistory/userHistory.js.php b/core/module/course/view/userHistory/userHistory.js.php index df88874..bd0c300 100644 --- a/core/module/course/view/userHistory/userHistory.js.php +++ b/core/module/course/view/userHistory/userHistory.js.php @@ -15,6 +15,10 @@ $(document).ready((function () { $('#dataTables').DataTable({ language: { url: "core/vendor/datatables/french.json" - } + }, + searching: false, + pageLength: 100, + lengthChange: false, + paging: false }); })); \ No newline at end of file diff --git a/core/module/course/view/userHistory/userHistory.php b/core/module/course/view/userHistory/userHistory.php index beaaed8..0e6d9f4 100644 --- a/core/module/course/view/userHistory/userHistory.php +++ b/core/module/course/view/userHistory/userHistory.php @@ -8,7 +8,11 @@ - 'dataTables']); ?> +
+
+ 'dataTables']); ?> +
+
\ No newline at end of file