From 6c2092582766a3b5ce7439be63abbc4b8c4df439 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 4 May 2012 09:33:30 +1200 Subject: [PATCH] MDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade as well as lower. --- grade/grading/form/guide/lang/en/gradingform_guide.php | 2 +- grade/grading/form/guide/renderer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grade/grading/form/guide/lang/en/gradingform_guide.php b/grade/grading/form/guide/lang/en/gradingform_guide.php index 77c13914b294e..6ada6f6488d46 100644 --- a/grade/grading/form/guide/lang/en/gradingform_guide.php +++ b/grade/grading/form/guide/lang/en/gradingform_guide.php @@ -55,7 +55,7 @@ $string['err_noshortname'] = 'Criterion name can not be empty'; $string['err_scoreinvalid'] = 'The score given to {$a->criterianame} is not valid, the max score is: {$a->maxscore}'; $string['gradingof'] = '{$a} grading'; -$string['guidemappingexplained'] = 'WARNING: Your marking guide has a maximum grade of {$a->maxscore} points but the maximum grade set in your activity is {$a->modulegrade} The maximum score set in your marking guide will be scaled up to the maximum grade in the module.
+$string['guidemappingexplained'] = 'WARNING: Your marking guide has a maximum grade of {$a->maxscore} points but the maximum grade set in your activity is {$a->modulegrade} The maximum score set in your marking guide will be scaled to the maximum grade in the module.
Intermediate scores will be converted respectively and rounded to the nearest available grade.'; $string['guidenotcompleted'] = 'Please provide a valid grade for each criterion'; $string['guideoptions'] = 'Marking guide options'; diff --git a/grade/grading/form/guide/renderer.php b/grade/grading/form/guide/renderer.php index ea4c7345c3b78..74a996a175dd3 100644 --- a/grade/grading/form/guide/renderer.php +++ b/grade/grading/form/guide/renderer.php @@ -625,7 +625,7 @@ public function display_guide_mapping_explained($scores) { if (!$scores) { return $html; } - if (isset($scores['modulegrade']) && $scores['maxscore'] < $scores['modulegrade']) { + if (isset($scores['modulegrade']) && $scores['maxscore'] != $scores['modulegrade']) { $html .= $this->box(html_writer::tag('div', get_string('guidemappingexplained', 'gradingform_guide', (object)$scores)) , 'generalbox gradingform_guide-error'); }