diff --git a/core/module/course/course.php b/core/module/course/course.php index 1d7faa4..b148c71 100644 --- a/core/module/course/course.php +++ b/core/module/course/course.php @@ -72,6 +72,8 @@ class course extends common public static $userHistory = []; + public static $userStat = []; + public function index() { @@ -977,6 +979,9 @@ class course extends common ]; } } + + $floorTime = 99999999999; + $topTime = 0; foreach ($history as $pageId => $times) { // Dates de consultation de la page @@ -986,18 +991,28 @@ class course extends common self::$userHistory[] = [ $pages[$pageId]['number'], html_entity_decode($pages[$pageId]['title']), - helper::dateUTF8('%d %B %Y %H:%M:%S', $time) + helper::dateUTF8('%d %B %Y %H:%M', $time) ]; + $floorTime = $floorTime < $time ? $floorTime : $time; + $TopTime = $TopTime > $time ? $TopTime : $time; } } else { self::$userHistory[] = [ $pages[$pageId]['number'], html_entity_decode($pages[$pageId]['title']), - helper::dateUTF8('%d %B %Y %H:%M:%S', $times) + helper::dateUTF8('%d %B %Y %H:%M', $times) ]; + $floorTime = $floorTime < $times ? $floorTime : $times; + $topTime = $topTime > $times ?$topTime : $times; } } + self::$userStat['floor'] = helper::dateUTF8('%d %B %Y %H:%M',$floorTime); + self::$userStat['top'] = helper::dateUTF8('%d %B %Y %H:%M',$topTime); + $d = $topTime - $floorTime; + $d_hours = floor($d / 3600); + $d_minutes = floor(($d % 3600) / 60); + self::$userStat['time'] = $d_hours . ' heures, ' . $d_minutes . ' minutes ' ; // Valeurs en sortie $this->addOutput([ diff --git a/core/module/course/view/userHistory/userHistory.php b/core/module/course/view/userHistory/userHistory.php index 25fd3eb..fb0b31f 100644 --- a/core/module/course/view/userHistory/userHistory.php +++ b/core/module/course/view/userHistory/userHistory.php @@ -8,16 +8,31 @@
helper::baseUrl() . 'course/userHistoryExport/' . $this->getUrl(2) . '/' . $this->getUrl(3), + 'href' => helper::baseUrl() . 'course/userHistoryExport/' . $this->getUrl(2) . '/' . $this->getUrl(3), 'value' => template::ico('download'), 'help' => 'Exporter', ]) ?>
+
+
+ getData(['course', $this->getUrl(2), 'access']) === self::COURSE_ACCESS_DATE): ?> +

Espace ouvert le : + getData(['course', $this->getUrl(2), 'openingDate'])); ?>

Espace fermé le : + getData(['course', $this->getUrl(2), 'closingDate'])); ?>

+ +
+
+

Commencé le :

+

Terminé le :

+

Temps passé :

+
+
- 'dataTables']); ?> + 'dataTables']);?>
diff --git a/core/module/course/view/users/users.js.php b/core/module/course/view/users/users.js.php index 38475b7..aa850d5 100644 --- a/core/module/course/view/users/users.js.php +++ b/core/module/course/view/users/users.js.php @@ -29,7 +29,7 @@ $(document).ready((function () { locale: 'fr', "columnDefs": [ { - target: 5, + target: 6, orderable: false, searchable: false }