L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enabling inherit options for range and average rows in grader report

Browse Source
This commit is contained in:
nicolasconnault
2007-10-04 09:30:16 +00:00
parent c727acb64b
commit 78a2d9f05f
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/grader/lib.php
+6 -18
View File
@@ -725,22 +725,14 @@ class grade_report_grader extends grade_report {
.$userid.'_'.$item->id.'" value="' . s($grade->feedback) . '" />';
}
} else {
// Percentage format if specified by user (check each item for a set preference)
} else { // Not editing
$gradedisplaytype = $item->get_displaytype();
$percentsign = '';
$grademin = $item->grademin;
$grademax = $item->grademax;
if ($gradedisplaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
if (!is_null($gradeval)) {
$gradeval = grade_to_percentage($gradeval, $grademin, $grademax);
}
$percentsign = '%';
}
// If feedback present, surround grade with feedback tooltip
// If feedback present, surround grade with feedback tooltip: Open span here
if (!empty($grade->feedback)) {
$overlib = '';
if ($grade->feedbackformat == 1) {
@@ -755,13 +747,7 @@ class grade_report_grader extends grade_report {
if ($item->needsupdate) {
$studentshtml .= '<span class="gradingerror">'.get_string('error').'</span>';
} else if ($gradedisplaytype == GRADE_DISPLAY_TYPE_LETTER) {
if (!is_null($gradeval)) {
$studentshtml .= grade_format_gradevalue($gradeval, $item, false, GRADE_DISPLAY_TYPE_LETTER, null);
}
} else if ($item->scaleid && !empty($scales_array[$item->scaleid])
&& $gradedisplaytype == GRADE_DISPLAY_TYPE_REAL) {
} elseif ($item->scaleid && !empty($scales_array[$item->scaleid])) {
$scale = $scales_array[$item->scaleid];
$scales = explode(",", $scale->scale);
@@ -775,9 +761,11 @@ class grade_report_grader extends grade_report {
if (is_null($gradeval)) {
$studentshtml .= '-';
} else {
$studentshtml .= format_float($gradeval, $decimalpoints). $percentsign;
$studentshtml .= grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null);
}
}
// Close feedback span
if (!empty($grade->feedback)) {
$studentshtml .= '</span>';
}
grade/report/grader/preferences_form.php
+4 -2
View File
@@ -51,11 +51,13 @@ class grader_report_preferences_form extends moodleform {
'showlocks' => $checkbox_default);
$preferences['prefrows'] = array(
'averagesdisplaytype' => array(GRADE_DISPLAY_TYPE_DEFAULT => 'default',
'averagesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
'rangesdisplaytype' => array(GRADE_DISPLAY_TYPE_DEFAULT => 'default',
'rangesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),