Merge from 1.6. Refactored this report module so that we can use it as an
admin report module.
This commit is contained in:
vyshane
@@ -40,6 +40,7 @@
|
||||
.' timeend >= '.$param->timeafter
|
||||
.$param->extras
|
||||
.' ORDER BY timeend DESC';
|
||||
|
||||
$stats = get_records_sql($sql);
|
||||
|
||||
$stats = stats_fix_zeros($stats,$param->timeafter,$param->table,(!empty($param->line2)),(!empty($param->line3)));
|
||||
|
||||
+14
-183
@@ -2,6 +2,7 @@
|
||||
|
||||
require_once('../../../config.php');
|
||||
require_once($CFG->dirroot.'/lib/statslib.php');
|
||||
require_once($CFG->dirroot.'/course/report/stats/lib.php');
|
||||
|
||||
if (empty($CFG->enablestats)) {
|
||||
error("Stats is not enabled.");
|
||||
@@ -37,194 +38,24 @@
|
||||
}
|
||||
|
||||
add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
|
||||
|
||||
stats_check_uptodate($course->id);
|
||||
|
||||
|
||||
|
||||
$strreports = get_string("reports");
|
||||
$strstats = get_string('stats');
|
||||
|
||||
$menu = report_stats_mode_menu($course, $mode, $time);
|
||||
|
||||
$crumb = "<a href=\"../../view.php?id=$course->id\">$course->shortname</a> ->
|
||||
<a href=\"../../report.php?id=$course->id\">$strreports</a> ->
|
||||
$strstats";
|
||||
|
||||
print_header("$course->shortname: $strstats", "$course->fullname",
|
||||
$crumb, '', '', true, ' ', $menu);
|
||||
|
||||
$reportoptions = stats_get_report_options($courseid,$mode);
|
||||
|
||||
$courses = get_courses('all','c.shortname','c.id,c.shortname,c.fullname');
|
||||
$courseoptions = array();
|
||||
|
||||
foreach ($courses as $c) {
|
||||
if (isteacher($c->id)) {
|
||||
$courseoptions[$c->id] = $c->shortname;
|
||||
}
|
||||
}
|
||||
|
||||
$tableprefix = $CFG->prefix.'stats_';
|
||||
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
$tableprefix = $CFG->prefix.'stats_user_';
|
||||
}
|
||||
|
||||
$earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
|
||||
$earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
|
||||
$earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
|
||||
|
||||
if (empty($earliestday)) $earliestday = time();
|
||||
if (empty($earliestweek)) $earliestweek = time();
|
||||
if (empty($earliestmonth)) $earliestmonth = time();
|
||||
|
||||
$now = stats_get_base_daily();
|
||||
$lastweekend = stats_get_base_weekly();
|
||||
$lastmonthend = stats_get_base_monthly();
|
||||
|
||||
$timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
|
||||
|
||||
if (empty($timeoptions)) {
|
||||
error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
|
||||
}
|
||||
|
||||
$options = array();
|
||||
$options[STATS_MODE_GENERAL] = get_string('statsmodegeneral');
|
||||
$options[STATS_MODE_DETAILED] = get_string('statsmodedetailed');
|
||||
if (isadmin()) {
|
||||
$options[STATS_MODE_RANKED] = get_string('reports');
|
||||
}
|
||||
|
||||
$menu = choose_from_menu($options,'mode',$mode,'','this.form.submit();',0,true);
|
||||
|
||||
$menu = '<form action="index.php" method="post">'."\n"
|
||||
.'<input type="hidden" name="course" value="'.$course->id.'" />'."\n"
|
||||
.'<input type="hidden" name="time" value="'.$time.'" />'."\n"
|
||||
.$menu."\n".'</form>';
|
||||
|
||||
print_header("$course->shortname: $strstats", "$course->fullname",
|
||||
"<a href=\"../../view.php?id=$course->id\">$course->shortname</a> ->
|
||||
<a href=\"../../report.php?id=$course->id\">$strreports</a> ->
|
||||
$strstats", '','',true,' ',$menu);
|
||||
|
||||
echo '<form action="index.php" method="post">'."\n"
|
||||
.'<input type="hidden" name="mode" value="'.$mode.'" />'."\n";
|
||||
|
||||
$table->width = '*';
|
||||
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
if (!empty($time)) {
|
||||
$param = stats_get_parameters($time,null,$course->id,$mode); // we only care about the table and the time string.
|
||||
$sql = 'SELECT DISTINCT s.userid,s.roleid,u.firstname,u.lastname,u.idnumber FROM '.$CFG->prefix.'stats_user_'.$param->table.' s JOIN '.$CFG->prefix.'user u ON u.id = s.userid '
|
||||
.'WHERE courseid = '.$course->id.' AND timeend >= '.$param->timeafter . ((!empty($param->stattype)) ? ' AND stattype = \''.$param->stattype.'\'' : '');
|
||||
if (!isadmin()) {
|
||||
$sql .= ' AND (s.roleid = 1 OR s.userid = '.$USER->id .")";
|
||||
}
|
||||
$sql .= " ORDER BY s.roleid ";
|
||||
} else {
|
||||
$sql = 'SELECT s.userid,u.firstname,u.lastname,u.idnumber,1 AS roleid FROM '.$CFG->prefix.'user_students s JOIN '.$CFG->prefix.'user u ON u.id = s.userid WHERE course = '.$course->id;
|
||||
}
|
||||
|
||||
if (!$us = get_records_sql($sql)) {
|
||||
error('Cannot enter detailed view: No users found for this course.');
|
||||
}
|
||||
$admins = get_admins();
|
||||
foreach ($us as $u) {
|
||||
$role = $course->student;
|
||||
if ($u->roleid == 2) {
|
||||
$role = $course->teacher;
|
||||
}
|
||||
if (array_key_exists($u->userid,$admins)) {
|
||||
$role = get_string('admin');
|
||||
}
|
||||
$users[$u->userid] = $role.' - '.fullname($u,true);
|
||||
}
|
||||
if (empty($time)) {
|
||||
if (isadmin()) {
|
||||
$sql = 'SELECT t.userid,u.firstname,u.lastname,u.idnumber,1 AS roleid FROM '.$CFG->prefix.'user_teachers t JOIN '.$CFG->prefix.'user u ON u.id = t.userid WHERE course = '.$course->id;
|
||||
$moreusers = get_records_sql($sql);
|
||||
foreach ($moreusers as $u) {
|
||||
$users[$u->userid] = $course->teacher .' - '.fullname($u,true);
|
||||
}
|
||||
} else {
|
||||
$users[$USER->id] = $course->teacher.' - '.fullname($USER,true);
|
||||
}
|
||||
}
|
||||
|
||||
// make sure we sort so teachers are at the top.
|
||||
if (strcmp($course->student,$course->teacher) < 0) {
|
||||
arsort($users);
|
||||
} else {
|
||||
asort($users);
|
||||
}
|
||||
|
||||
$table->align = array('left','left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('users'),choose_from_menu($users,'userid',$userid,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
} else {
|
||||
$table->align = array('left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
}
|
||||
|
||||
|
||||
print_table($table);
|
||||
echo '</form>';
|
||||
|
||||
if (!empty($report) && !empty($time)) {
|
||||
if ($report == STATS_REPORT_LOGINS && $course->id != SITEID) {
|
||||
error("This type of report is only available for the site course");
|
||||
}
|
||||
$param = stats_get_parameters($time,$report,$course->id,$mode);
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
$param->table = 'user_'.$param->table;
|
||||
}
|
||||
$sql = 'SELECT timeend,'.$param->fields.' FROM '.$CFG->prefix.'stats_'.$param->table.' WHERE '
|
||||
.(($course->id == SITEID) ? '' : ' courseid = '.$course->id.' AND ')
|
||||
.((!empty($userid)) ? ' userid = '.$userid.' AND ' : '')
|
||||
. ((!empty($param->stattype)) ? ' stattype = \''.$param->stattype.'\' AND ' : '')
|
||||
.' timeend >= '.$param->timeafter
|
||||
.$param->extras
|
||||
.' ORDER BY timeend DESC';
|
||||
|
||||
$stats = get_records_sql($sql);
|
||||
|
||||
if (empty($stats)) {
|
||||
error(get_string('statsnodata'.((!empty($user)) ? 'user' : '')),$CFG->wwwroot.'/stats/index.php?course='.$course->id.'&mode='.$mode.'&time='.$time);
|
||||
}
|
||||
|
||||
$stats = stats_fix_zeros($stats,$param->timeafter,$param->table,(!empty($param->line2)));
|
||||
|
||||
print_heading($course->shortname.' - '.get_string('statsreport'.$report).((!empty($user)) ? ' '.get_string('statsreportforuser').' ' .fullname($user,true) : ''));
|
||||
|
||||
if (empty($CFG->gdversion)) {
|
||||
echo "(".get_string("gdneed").")";
|
||||
} else {
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
echo '<center><img src="'.$CFG->wwwroot.'/course/report/stats/graph.php?mode='.$mode.'&course='.$course->id.'&time='.$time.'&report='.$report.'&userid='.$userid.'" /></center>';
|
||||
} else {
|
||||
echo '<center><img src="'.$CFG->wwwroot.'/course/report/stats/graph.php?mode='.$mode.'&course='.$course->id.'&time='.$time.'&report='.$report.'" /></center>';
|
||||
}
|
||||
}
|
||||
|
||||
$table = new object();
|
||||
$table->align = array('left','center','center','center');
|
||||
$param->table = str_replace('user_','',$param->table);
|
||||
$table->head = array(get_string('periodending','moodle',$param->table),$param->line1);
|
||||
if (!empty($param->line2)) {
|
||||
$table->head[] = $param->line2;
|
||||
}
|
||||
$table->head[] = get_string('logs');
|
||||
|
||||
foreach ($stats as $stat) {
|
||||
$a = array(userdate($stat->timeend-(60*60*24),get_string('strftimedate'),$CFG->timezone),$stat->line1);
|
||||
if (isset($stat->line2)) {
|
||||
$a[] = $stat->line2;
|
||||
}
|
||||
if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
|
||||
$a[] = '<a href="'.$CFG->wwwroot.'/course/report/log/index.php?id='.$course->id.'&chooselog=1&showusers=1&showcourses=1&user='.$userid.'&date='.usergetmidnight($stat->timeend-(60*60*24)).'">'.get_string('course').' ' .get_string('logs').'</a> ';
|
||||
}
|
||||
$table->data[] = $a;
|
||||
}
|
||||
print_table($table);
|
||||
}
|
||||
require_once($CFG->dirroot.'/course/report/stats/report.php');
|
||||
|
||||
print_footer();
|
||||
|
||||
|
||||
?>
|
||||
?>
|
||||
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
/**
|
||||
* This file is also required by /admin/reports/stats/index.php.
|
||||
*/
|
||||
|
||||
|
||||
require_once('../../../config.php');
|
||||
require_once($CFG->dirroot.'/lib/statslib.php');
|
||||
|
||||
|
||||
function report_stats_mode_menu($course, $mode, $time) {
|
||||
global $CFG;
|
||||
|
||||
$reportoptions = stats_get_report_options($course->id, $mode);
|
||||
$timeoptions = report_stats_timeoptions($mode);
|
||||
|
||||
if (empty($timeoptions)) {
|
||||
error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
|
||||
}
|
||||
|
||||
$options = array();
|
||||
$options[STATS_MODE_GENERAL] = get_string('statsmodegeneral');
|
||||
$options[STATS_MODE_DETAILED] = get_string('statsmodedetailed');
|
||||
if (isadmin()) {
|
||||
$options[STATS_MODE_RANKED] = get_string('reports');
|
||||
}
|
||||
|
||||
$menu = choose_from_menu($options,'mode',$mode,'','this.form.submit();',0,true);
|
||||
|
||||
$menu = '<form action="index.php" method="post">'."\n"
|
||||
.'<input type="hidden" name="course" value="'.$course->id.'" />'."\n"
|
||||
.'<input type="hidden" name="time" value="'.$time.'" />'."\n"
|
||||
.$menu."\n".'</form>';
|
||||
|
||||
return $menu;
|
||||
}
|
||||
|
||||
|
||||
function report_stats_timeoptions($mode) {
|
||||
global $CFG;
|
||||
|
||||
$tableprefix = $CFG->prefix.'stats_';
|
||||
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
$tableprefix = $CFG->prefix.'stats_user_';
|
||||
}
|
||||
|
||||
$earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
|
||||
$earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
|
||||
$earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
|
||||
|
||||
if (empty($earliestday)) $earliestday = time();
|
||||
if (empty($earliestweek)) $earliestweek = time();
|
||||
if (empty($earliestmonth)) $earliestmonth = time();
|
||||
|
||||
$now = stats_get_base_daily();
|
||||
$lastweekend = stats_get_base_weekly();
|
||||
$lastmonthend = stats_get_base_monthly();
|
||||
|
||||
return stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
@@ -0,0 +1,142 @@
|
||||
<?php
|
||||
|
||||
$courses = get_courses('all','c.shortname','c.id,c.shortname,c.fullname');
|
||||
$courseoptions = array();
|
||||
|
||||
foreach ($courses as $c) {
|
||||
if (isteacher($c->id)) {
|
||||
$courseoptions[$c->id] = $c->shortname;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
echo '<form action="index.php" method="post">'."\n"
|
||||
.'<input type="hidden" name="mode" value="'.$mode.'" />'."\n";
|
||||
|
||||
$reportoptions = stats_get_report_options($course->id, $mode);
|
||||
$timeoptions = report_stats_timeoptions($mode);
|
||||
$table->width = '*';
|
||||
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
if (!empty($time)) {
|
||||
$param = stats_get_parameters($time,null,$course->id,$mode); // we only care about the table and the time string.
|
||||
$sql = 'SELECT DISTINCT s.userid,s.roleid,u.firstname,u.lastname,u.idnumber FROM '.$CFG->prefix.'stats_user_'.$param->table.' s JOIN '.$CFG->prefix.'user u ON u.id = s.userid '
|
||||
.'WHERE courseid = '.$course->id.' AND timeend >= '.$param->timeafter . ((!empty($param->stattype)) ? ' AND stattype = \''.$param->stattype.'\'' : '');
|
||||
if (!isadmin()) {
|
||||
$sql .= ' AND (s.roleid = 1 OR s.userid = '.$USER->id .")";
|
||||
}
|
||||
$sql .= " ORDER BY s.roleid ";
|
||||
} else {
|
||||
$sql = 'SELECT s.userid,u.firstname,u.lastname,u.idnumber,1 AS roleid FROM '.$CFG->prefix.'user_students s JOIN '.$CFG->prefix.'user u ON u.id = s.userid WHERE course = '.$course->id;
|
||||
}
|
||||
|
||||
if (!$us = get_records_sql($sql)) {
|
||||
error('Cannot enter detailed view: No users found for this course.');
|
||||
}
|
||||
$admins = get_admins();
|
||||
foreach ($us as $u) {
|
||||
$role = $course->student;
|
||||
if ($u->roleid == 2) {
|
||||
$role = $course->teacher;
|
||||
}
|
||||
if (array_key_exists($u->userid,$admins)) {
|
||||
$role = get_string('admin');
|
||||
}
|
||||
$users[$u->userid] = $role.' - '.fullname($u,true);
|
||||
}
|
||||
if (empty($time)) {
|
||||
if (isadmin()) {
|
||||
$sql = 'SELECT t.userid,u.firstname,u.lastname,u.idnumber,1 AS roleid FROM '.$CFG->prefix.'user_teachers t JOIN '.$CFG->prefix.'user u ON u.id = t.userid WHERE course = '.$course->id;
|
||||
$moreusers = get_records_sql($sql);
|
||||
foreach ($moreusers as $u) {
|
||||
$users[$u->userid] = $course->teacher .' - '.fullname($u,true);
|
||||
}
|
||||
} else {
|
||||
$users[$USER->id] = $course->teacher.' - '.fullname($USER,true);
|
||||
}
|
||||
}
|
||||
|
||||
// make sure we sort so teachers are at the top.
|
||||
if (strcmp($course->student,$course->teacher) < 0) {
|
||||
arsort($users);
|
||||
} else {
|
||||
asort($users);
|
||||
}
|
||||
|
||||
$table->align = array('left','left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('users'),choose_from_menu($users,'userid',$userid,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
} else {
|
||||
$table->align = array('left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
}
|
||||
|
||||
|
||||
print_table($table);
|
||||
echo '</form>';
|
||||
|
||||
if (!empty($report) && !empty($time)) {
|
||||
if ($report == STATS_REPORT_LOGINS && $course->id != SITEID) {
|
||||
error("This type of report is only available for the site course");
|
||||
}
|
||||
$param = stats_get_parameters($time,$report,$course->id,$mode);
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
$param->table = 'user_'.$param->table;
|
||||
}
|
||||
$sql = 'SELECT timeend,'.$param->fields.' FROM '.$CFG->prefix.'stats_'.$param->table.' WHERE '
|
||||
.(($course->id == SITEID) ? '' : ' courseid = '.$course->id.' AND ')
|
||||
.((!empty($userid)) ? ' userid = '.$userid.' AND ' : '')
|
||||
. ((!empty($param->stattype)) ? ' stattype = \''.$param->stattype.'\' AND ' : '')
|
||||
.' timeend >= '.$param->timeafter
|
||||
.$param->extras
|
||||
.' ORDER BY timeend DESC';
|
||||
|
||||
$stats = get_records_sql($sql);
|
||||
|
||||
if (empty($stats)) {
|
||||
error(get_string('statsnodata'.((!empty($user)) ? 'user' : '')),$CFG->wwwroot.'/stats/index.php?course='.$course->id.'&mode='.$mode.'&time='.$time);
|
||||
}
|
||||
|
||||
$stats = stats_fix_zeros($stats,$param->timeafter,$param->table,(!empty($param->line2)));
|
||||
|
||||
print_heading($course->shortname.' - '.get_string('statsreport'.$report).((!empty($user)) ? ' '.get_string('statsreportforuser').' ' .fullname($user,true) : ''));
|
||||
|
||||
if (empty($CFG->gdversion)) {
|
||||
echo "(".get_string("gdneed").")";
|
||||
} else {
|
||||
if ($mode == STATS_MODE_DETAILED) {
|
||||
echo '<center><img src="'.$CFG->wwwroot.'/course/report/stats/graph.php?mode='.$mode.'&course='.$course->id.'&time='.$time.'&report='.$report.'&userid='.$userid.'" /></center>';
|
||||
} else {
|
||||
echo '<center><img src="'.$CFG->wwwroot.'/course/report/stats/graph.php?mode='.$mode.'&course='.$course->id.'&time='.$time.'&report='.$report.'" /></center>';
|
||||
}
|
||||
}
|
||||
|
||||
$table = new object();
|
||||
$table->align = array('left','center','center','center');
|
||||
$param->table = str_replace('user_','',$param->table);
|
||||
$table->head = array(get_string('periodending','moodle',$param->table),$param->line1);
|
||||
if (!empty($param->line2)) {
|
||||
$table->head[] = $param->line2;
|
||||
}
|
||||
$table->head[] = get_string('logs');
|
||||
|
||||
foreach ($stats as $stat) {
|
||||
$a = array(userdate($stat->timeend-(60*60*24),get_string('strftimedate'),$CFG->timezone),$stat->line1);
|
||||
if (isset($stat->line2)) {
|
||||
$a[] = $stat->line2;
|
||||
}
|
||||
if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
|
||||
$a[] = '<a href="'.$CFG->wwwroot.'/course/report/log/index.php?id='.$course->id.'&chooselog=1&showusers=1&showcourses=1&user='.$userid.'&date='.usergetmidnight($stat->timeend-(60*60*24)).'">'.get_string('course').' ' .get_string('logs').'</a> ';
|
||||
}
|
||||
$table->data[] = $a;
|
||||
}
|
||||
print_table($table);
|
||||
}
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user