ZwiiCMS-Team/ZwiiCampus
ZwiiCMS-Team/ZwiiCampus
8
6
Fork 1
Code Releases 69 Activity

v44 format de l'historique

Browse Source
This commit is contained in:
Fred Tempez 2023-10-18 14:37:33 +02:00
parent 44856c03c6
commit b88e99e31d
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -50,7 +50,7 @@ class common
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '1.0.43'; const ZWII_VERSION = '1.0.44';
// URL autoupdate // URL autoupdate
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/lms/'; const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/lms/';

3
core/module/course/course.php
View File

@ -672,10 +672,11 @@ class course extends common
$courseId = $this->getUrl(2); $courseId = $this->getUrl(2);
$userId = $this->getUrl(3); $userId = $this->getUrl(3);
$history = $this->getData(['enrolment', $courseId, $userId]); $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) { foreach ($history['history'] as $pageId => $time) {
self::$userHistory[$pageId] = [ self::$userHistory[$pageId] = [
helper::dateUTF8('%d %B %Y - %H:%M:%S', $time), helper::dateUTF8('%d %B %Y - %H:%M:%S', $time),
$this->getData(['page', $pageId, 'shortTitle']), $pages['page'][$pageId]['shortTitle'],
]; ];
} }

6
core/module/course/view/userHistory/userHistory.js.php
View File

@ -15,6 +15,10 @@ $(document).ready((function () {
$('#dataTables').DataTable({ $('#dataTables').DataTable({
language: { language: {
url: "core/vendor/datatables/french.json" url: "core/vendor/datatables/french.json"
} },
searching: false,
pageLength: 100,
lengthChange: false,
paging: false
}); });
})); }));

6
core/module/course/view/userHistory/userHistory.php
View File

@ -8,7 +8,11 @@
</div> </div>
</div> </div>
<?php if ($module::$userHistory): ?> <?php if ($module::$userHistory): ?>
<?php echo template::table([6, 6], $module::$userHistory, ['Page', 'Dernière consultation de cette page'], ['id' => 'dataTables']); ?> <div class="row textAlignCenter">
<div class="col8">
<?php echo template::table([6, 6], $module::$userHistory, ['Dernière consultation de cette page', 'Titre de la page'], ['id' => 'dataTables']); ?>
</div>
</div>
<?php else: ?> <?php else: ?>
<?php echo template::speech('Aucun historique'); ?> <?php echo template::speech('Aucun historique'); ?>
<?php endif; ?> <?php endif; ?>