moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed up the graphs (one for userday and they are also now correct for timezones)

Browse source
This commit is contained in:
martin 2002-07-27 13:33:50 +00:00
parent cbd1170e91
commit 394933864c
2 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

45
course/loggraph.php
View file

@ -34,7 +34,7 @@
case "usercourse.png": case "usercourse.png":
$timestart = $course->startdate; $timestart = usergetmidnight($course->startdate);
$i = 0; $i = 0;
while ($timestart < $timenow) { while ($timestart < $timenow) {
$timefinish = $timestart + (3600 * 24); $timefinish = $timestart + (3600 * 24);
@ -44,7 +44,7 @@
$logs[$i] = 0; $logs[$i] = 0;
} }
$logs[$i] = $logcount->count; $logs[$i] = $logcount->count;
$days[$i] = date("j M", $timestart); $days[$i] = userdate($timestart, "%a %e %b");
$i++; $i++;
$timestart = $timefinish; $timestart = $timefinish;
} }
@ -53,12 +53,12 @@
$graph = new graph(750, 400); $graph = new graph(750, 400);
$graph->parameter['title'] = "Rough usage of $course->shortname by $user->firstname $user->lastname"; $graph->parameter['title'] = "Hits on $course->shortname by $user->firstname $user->lastname";
$graph->x_data = $days; $graph->x_data = $days;
$graph->y_data['logs'] = $logs; $graph->y_data['logs'] = $logs;
$graph->y_format['logs'] = array('colour' => 'blue','bar' => 'fill','legend' =>'actual','bar_size' => 0.4); $graph->y_format['logs'] = array('colour' => 'blue','bar' => 'fill','legend' =>'actual','bar_size' => 0.9);
$graph->y_label_left = "Hits"; $graph->y_label_left = "Hits";
$graph->label_size = "6"; $graph->label_size = "6";
@ -73,11 +73,42 @@
case "userday.png": case "userday.png":
if (! $date) { if ($date) {
error("Must specify a date if you use userday.png format"); $timestart = usergetmidnight($date);
} else {
$timestart = usergetmidnight(time());
}
while ($timestart < $timenow) {
$timefinish = $timestart + 3600;
if (! $logcount = get_record_sql("SELECT COUNT(*) as count FROM log
WHERE user = '$user->id' AND course = '$course->id'
AND `time` > '$timestart' AND `time` < '$timefinish'")) {
$logs[$i] = 0;
}
$logs[$i] = $logcount->count;
$hours[$i] = userdate($timestart, "%I %p");
$i++;
$timestart = $timefinish;
} }
// XXX still to be done. The day was getting long! $maxlogs = max($logs);
$graph = new graph(750, 400);
$graph->parameter['title'] = "Today's hits on $course->shortname by $user->firstname $user->lastname";
$graph->x_data = $hours;
$graph->y_data['logs'] = $logs;
$graph->y_format['logs'] = array('colour' => 'blue','bar' => 'fill','legend' =>'actual','bar_size' => 0.9);
$graph->y_label_left = "Hits";
$graph->label_size = "6";
$graph->y_order = array('logs');
$graph->parameter['shadow'] = 'none';
$graph->draw_stack();
break; break;

2
course/user.php
View file

@ -61,7 +61,7 @@
switch ($mode) { switch ($mode) {
case "today" : case "today" :
echo "<HR><CENTER>"; echo "<HR><CENTER>";
print_log_graph($course, $user->id, "userday.png", usergetmidnight(time()) ); print_log_graph($course, $user->id, "userday.png", time() );
echo "</CENTER>"; echo "</CENTER>";
print_log($course, $user->id, usergetmidnight(time()), "ORDER BY l.time DESC"); print_log($course, $user->id, usergetmidnight(time()), "ORDER BY l.time DESC");
break; break;