mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle
This commit is contained in:
commit
65a427cc64
@ -576,8 +576,10 @@ function report_log_userall_data($course, $user, $logreader) {
|
|||||||
$rawlogs = report_log_usercourse($user->id, $courseselect, $coursestart, $logreader);
|
$rawlogs = report_log_usercourse($user->id, $courseselect, $coursestart, $logreader);
|
||||||
|
|
||||||
foreach ($rawlogs as $rawlog) {
|
foreach ($rawlogs as $rawlog) {
|
||||||
|
if (isset($logs['labels'][$rawlog->day])) {
|
||||||
$logs['series'][$rawlog->day] = $rawlog->num;
|
$logs['series'][$rawlog->day] = $rawlog->num;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $logs;
|
return $logs;
|
||||||
}
|
}
|
||||||
@ -616,8 +618,10 @@ function report_log_usertoday_data($course, $user, $date, $logreader) {
|
|||||||
$rawlogs = report_log_userday($user->id, $courseselect, $daystart, $logreader);
|
$rawlogs = report_log_userday($user->id, $courseselect, $daystart, $logreader);
|
||||||
|
|
||||||
foreach ($rawlogs as $rawlog) {
|
foreach ($rawlogs as $rawlog) {
|
||||||
|
if (isset($logs['labels'][$rawlog->hour])) {
|
||||||
$logs['series'][$rawlog->hour] = $rawlog->num;
|
$logs['series'][$rawlog->hour] = $rawlog->num;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $logs;
|
return $logs;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user