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

MDL-9137 Fixing errors in the overview report

Browse source
This commit is contained in:
nicolasconnault 2007-08-10 14:58:21 +00:00
parent a8bb516dce
commit bc430af20d
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
grade/report/outcomes/index.php
View file

@ -117,7 +117,12 @@ foreach ($report_info as $outcomeid => $outcomedata) {
// Calculate outcome average // Calculate outcome average
if (is_array($outcomedata['items'])) { if (is_array($outcomedata['items'])) {
$avg = $outcomedata['outcome']->sum / count($outcomedata['items']); $count = count($outcomedata['items']);
if ($count > 0) {
$avg = $outcomedata['outcome']->sum / $count;
} else {
$avg = $outcomedata['outcome']->sum;
}
$avg_html = $scale->get_nearest_item($avg) . " (" . round($avg, 2) . ")\n"; $avg_html = $scale->get_nearest_item($avg) . " (" . round($avg, 2) . ")\n";
} else { } else {
$avg_html = ' - '; $avg_html = ' - ';

2
grade/report/overview/db/access.php
View file

@ -2,7 +2,7 @@
$gradereport_overview_capabilities = array( $gradereport_overview_capabilities = array(
'gradereport/outcomes:view' => array( 'gradereport/overview:view' => array(
'riskbitmask' => RISK_PERSONAL, 'riskbitmask' => RISK_PERSONAL,
'captype' => 'read', 'captype' => 'read',
'contextlevel' => CONTEXT_COURSE, 'contextlevel' => CONTEXT_COURSE,

11
grade/report/overview/index.php
View file

@ -27,10 +27,11 @@ require_once $CFG->libdir.'/gradelib.php';
require_once $CFG->dirroot.'/grade/lib.php'; require_once $CFG->dirroot.'/grade/lib.php';
require_once $CFG->dirroot.'/grade/report/overview/lib.php'; require_once $CFG->dirroot.'/grade/report/overview/lib.php';
$courseid = optional_param('id', $COURSE->id, PARAM_INT);
$userid = optional_param('userid', $USER->id, PARAM_INT); $userid = optional_param('userid', $USER->id, PARAM_INT);
/// basic access checks /// basic access checks
if (!$course = get_record('course', 'id', $COURSE->id)) { if (!$course = get_record('course', 'id', $courseid)) {
print_error('nocourseid'); print_error('nocourseid');
} }
require_login($course); require_login($course);
@ -58,13 +59,13 @@ if (has_capability('moodle/grade:viewall', $context)) {
} }
/// return tracking object /// return tracking object
$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'user', 'courseid'=>$course->id, 'userid'=>$userid)); $gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'overview', 'courseid'=>$course->id, 'userid'=>$userid));
/// last selected report session tracking /// last selected report session tracking
if (!isset($USER->grade_last_report)) { if (!isset($USER->grade_last_report)) {
$USER->grade_last_report = array(); $USER->grade_last_report = array();
} }
$USER->grade_last_report[$course->id] = 'user'; $USER->grade_last_report[$course->id] = 'overview';
/// Build navigation /// Build navigation
$strgrades = get_string('grades'); $strgrades = get_string('grades');
@ -77,7 +78,7 @@ print_header_simple($strgrades.': '.$reportname, ': '.$strgrades, $navigation,
'', '', true, '', navmenu($course)); '', '', true, '', navmenu($course));
/// Print the plugin selector at the top /// Print the plugin selector at the top
print_grade_plugin_selector($course->id, 'report', 'user'); print_grade_plugin_selector($course->id, 'report', 'overview');
if ($access) { if ($access) {
@ -91,7 +92,7 @@ if ($access) {
$gradesum = 0; $gradesum = 0;
// print the page // print the page
print_heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); print_heading(get_string('modulename', 'gradereport_overview'). ' - '.fullname($report->user));
if ($report->fill_table()) { if ($report->fill_table()) {
echo $report->print_table(true); echo $report->print_table(true);

1
lang/en_utf8/gradereport_overview.php
View file

@ -1,6 +1,5 @@
<?PHP // $Id$ <?PHP // $Id$
$string['modulename'] = 'Overview report'; $string['modulename'] = 'Overview report';
$string['user:view'] = 'View your own grade report';
?> ?>

2
lib/gradelib.php
View file

@ -264,7 +264,7 @@ function grade_update($source, $courseid, $itemtype, $itemmodule, $iteminstance,
/** /**
* Tells a module whether a grade (or grade_item if $userid is not given) is currently locked or not. * Tells a module whether a grade (or grade_item if $userid is not given) is currently locked or not.
* If it's locked to the current use then the module can print a nice message or prevent editing in the module. * If it's locked to the current user then the module can print a nice message or prevent editing in the module.
* If no $userid is given, the method will always return the grade_item's locked state. * If no $userid is given, the method will always return the grade_item's locked state.
* If a $userid is given, the method will first check the grade_item's locked state (the column). If it is locked, * If a $userid is given, the method will first check the grade_item's locked state (the column). If it is locked,
* the method will return true no matter the locked state of the specific grade being checked. If unlocked, it will * the method will return true no matter the locked state of the specific grade being checked. If unlocked, it will