lapervenche/ZwiiCampus
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCampus
Code Pull Requests Activity

Statistiques nombre de pages vues okay

Browse Source
This commit is contained in:
Fred Tempez 2023-10-21 11:46:58 +02:00
parent 1cac48fd10
commit d5d001d2b4
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -393,7 +393,7 @@ class common
setcookie('ZWII_UI', self::$i18nUI, time() + 3600, helper::baseUrl(false, false), '', false, false); setcookie('ZWII_UI', self::$i18nUI, time() + 3600, helper::baseUrl(false, false), '', false, false);
setcookie('ZWII_SITE_CONTENT', self::$siteContent, time() + 3600, helper::baseUrl(false, false), '', false, false); setcookie('ZWII_SITE_CONTENT', self::$siteContent, time() + 3600, helper::baseUrl(false, false), '', false, false);
setlocale(LC_ALL, self::$i18nUI); setlocale(LC_ALL, self::$i18nUI);
// Construit la liste des pages parents/enfants // Construit la liste des pages parents/enfants
if ($this->hierarchy['all'] === []) { if ($this->hierarchy['all'] === []) {
$this->buildHierarchy(); $this->buildHierarchy();
@ -622,6 +622,7 @@ class common
'dir' => self::DATA_DIR . $path . '/', 'dir' => self::DATA_DIR . $path . '/',
'backup' => file_exists('site/data/.backup') 'backup' => file_exists('site/data/.backup')
]); ]);
} }
/** /**
@ -704,7 +705,6 @@ class common
/** /**
* Fonction pour construire le tableau des pages * Fonction pour construire le tableau des pages
* Appelée par le core uniquement
*/ */
private function buildHierarchy() private function buildHierarchy()
@ -1395,7 +1395,7 @@ class common
public function saveLog($message = '') public function saveLog($message = '')
{ {
// Journalisation // Journalisation
$dataLog = helper::dateUTF8('%Y %m %d', time(), self::$i18nUI) . ' - ' . helper::dateUTF8('%H:%M', time(), self::$i18nUI); $dataLog = helper::dateUTF8('%Y %m %d', time(), self::$i18nUI) . ' - ' . helper::dateUTF8('%H:%M', time(), self::$i18nUI);
$dataLog .= helper::getIp($this->getData(['config', 'connect', 'anonymousIp'])) . ';'; $dataLog .= helper::getIp($this->getData(['config', 'connect', 'anonymousIp'])) . ';';
$dataLog .= empty($this->getUser('id')) ? 'visitor;' : $this->getUser('id') . ';'; $dataLog .= empty($this->getUser('id')) ? 'visitor;' : $this->getUser('id') . ';';
$dataLog .= $message ? $this->getUrl() . ';' . $message : $this->getUrl(); $dataLog .= $message ? $this->getUrl() . ';' . $message : $this->getUrl();

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

@ -419,8 +419,9 @@ class course extends common
// Statistiques du cours sélectionné calcul du nombre de pages // Statistiques du cours sélectionné calcul du nombre de pages
$sumPages = 0; $sumPages = 0;
$data = json_decode(file_get_contents(self::DATA_DIR . $courseId . '/page.json'), true); $data = json_decode(file_get_contents(self::DATA_DIR . $courseId . '/page.json'), true);
// Exclure les barres et les pages masquées
foreach ($data['page'] as $pageId => $pageData) { foreach ($data['page'] as $pageId => $pageData) {
if ($pageData['block'] !== 'bar') { if ($pageData['position'] > 0) {
$sumPages++; $sumPages++;
} }
} }
@ -471,7 +472,8 @@ class course extends common
// Construction du tableau // Construction du tableau
self::$courseUsers[] = [ self::$courseUsers[] = [
$userId, //$userId,
$viewPages . '=' . $sumPages,
$this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']), $this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']),
$pageId, $pageId,
helper::dateUTF8('%d %B %Y - %H:%M', $maxTime), helper::dateUTF8('%d %B %Y - %H:%M', $maxTime),
@ -673,10 +675,12 @@ class course extends common
$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); $pages = json_decode(file_get_contents(self::DATA_DIR . $courseId . '/page.json'), true);
$pages = $pages ['page'];
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),
$pages['page'][$pageId]['title'], $pages[$pageId]['title'],
]; ];
} }

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

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