From 10312bf9a23b1e7dec118081ef78829450fd222a Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 29 May 2006 09:10:33 +0000 Subject: [PATCH] Fixed some issues with course overview report --- admin/report/courseoverview/index.php | 15 +++------ admin/report/courseoverview/mod.php | 45 ++++++++++++++++++++++++++- theme/standard/styles_color.css | 1 + 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php index f97a72dfbf..2ecc794832 100644 --- a/admin/report/courseoverview/index.php +++ b/admin/report/courseoverview/index.php @@ -93,12 +93,13 @@ foreach ($courses as $c) { $a = array(); $a[] = ''.get_field('course','shortname','id',$c->courseid).''; - $a[] = print_numeric_value($c->line1); + + $a[] = $c->line1; if (isset($c->line2)) { - $a[] = print_numeric_value($c->line2); + $a[] = $c->line2; } if (isset($c->line3)) { - $a[] = print_numeric_value($c->line3); + $a[] = $c->line3; } $table->data[] = $a; } @@ -107,12 +108,4 @@ print_footer(); -function print_numeric_value($value) { - list($whole, $decimals) = split ('[.,]', $value, 2); - if (intval($decimals) > 0) - return number_format($value,2,".",","); - else - return $value; -} - ?> diff --git a/admin/report/courseoverview/mod.php b/admin/report/courseoverview/mod.php index 93df623484..1350aa2dad 100644 --- a/admin/report/courseoverview/mod.php +++ b/admin/report/courseoverview/mod.php @@ -5,7 +5,50 @@ } if (!empty($CFG->enablestats)) { - echo ''.get_string('courseoverview').''; + + $strreports = get_string('reports'); + $strcourseoverview = get_string('courseoverview'); + + print_heading("$strcourseoverview:"); + + require_once($CFG->dirroot.'/lib/statslib.php'); + + $report = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT); + $time = optional_param('time', 0, PARAM_INT); + $numcourses = optional_param('numcourses', 20, PARAM_INT); + + $course = get_site(); + stats_check_uptodate($course->id); + + + $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED); + + $tableprefix = $CFG->prefix.'stats_'; + + $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); + + $table->width = '*'; + $table->align = array('left','left','left','left','left','left'); + $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true), + get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true), + '', + '') ; + + echo '
'."\n"; + print_table($table); + echo '
'; } ?> diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index d72a0a5bfa..1f3b3ae648 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -520,6 +520,7 @@ body#course-user .section { border-color:#AAAAAA; } +#admin-report .plugin, #course-report .plugin, #course-import .plugin { margin-bottom: 20px; -- 2.39.5