mirror of
https://github.com/moodle/moodle.git
synced 2025-04-25 18:35:14 +02:00
MDL-12517 - Move checking code into the user interface layer where it belongs. Merged from MOODLE_19_STABLE.
This commit is contained in:
parent
56af043f38
commit
0a2c84851c
@ -199,6 +199,20 @@ class grade_report_grader extends grade_report {
|
||||
$finalgrade = unformat_float($postedvalue);
|
||||
}
|
||||
|
||||
// Warn if the grade is out of bounds.
|
||||
$errorstr = '';
|
||||
if ($finalgrade < $grade_item->grademax) {
|
||||
$errorstr = 'lessthanmin';
|
||||
} else if ($finalgrade > $grade_item->grademax) {
|
||||
$errorstr = 'morethanmax';
|
||||
}
|
||||
if ($errorstr) {
|
||||
$user = get_record('user', 'id', $userid,'','','','','id, firstname, lastname');
|
||||
$gradestr->username = fullname($user);
|
||||
$gradestr->itemname = $grade_item->get_name();
|
||||
notify(get_string($errorstr, 'grades', $gradestr));
|
||||
}
|
||||
|
||||
} else if ($data_type == 'feedback') {
|
||||
$finalgrade = false;
|
||||
$trimmed = trim($postedvalue);
|
||||
|
@ -1366,18 +1366,6 @@ class grade_item extends grade_object {
|
||||
if (is_null($finalgrade)) {
|
||||
$grade->finalgrade = null;
|
||||
} else {
|
||||
// MDL-12517, warn user if grade is out of bounds
|
||||
if ($finalgrade < $this->grademin) {
|
||||
$user = get_record('user', 'id', $grade->userid,'','','','','id, firstname, lastname');
|
||||
$gradestr->username = fullname($user);
|
||||
$gradestr->itemname = $this->get_name();
|
||||
notify(get_string('lessthanmin', 'grades', $gradestr));
|
||||
} else if ($finalgrade > $this->grademax) {
|
||||
$user = get_record('user', 'id', $grade->userid,'','','','','id, firstname, lastname');
|
||||
$gradestr->username = fullname($user);
|
||||
$gradestr->itemname = $this->get_name();
|
||||
notify(get_string('morethanmax', 'grades', $gradestr));
|
||||
}
|
||||
$grade->finalgrade = (float)bounded_number($this->grademin, $finalgrade, $this->grademax);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user