mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 09:23:09 +02:00
Code Issues Projects Releases Wiki Activity

MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission

Browse Source
This commit is contained in:
Jody Steele 2013-10-16 11:19:34 -04:00 committed by Marina Glancy
parent e4ffd3dc7b
commit add50b5ab0
2 changed files with 7 additions and 3 deletions

2
mod/assign/gradeform.php

@ -94,7 +94,7 @@ class mod_assign_grade_form extends moodleform {
// This is a scale.
if ($scale = $DB->get_record('scale', array('id'=>-($instance->grade)))) {
$scaleoptions = make_menu_from_list($scale->scale);
if (!array_key_exists((int)$data['grade'], $scaleoptions)) {
if ((int)$data['grade'] !== -1 && !array_key_exists((int)$data['grade'], $scaleoptions)) {
$errors['grade'] = get_string('invalidgradeforscale', 'assign');
}
}

8
mod/assign/locallib.php

@ -3909,6 +3909,10 @@ class assign {
if ($grade->grade >= 0) {
$gradebookgrade['rawgrade'] = $grade->grade;
}
// Allow "no grade" to be chosen.
if ($grade->grade == -1) {
$gradebookgrade['rawgrade'] = NULL;
}
$gradebookgrade['userid'] = $grade->userid;
$gradebookgrade['usermodified'] = $grade->grader;
$gradebookgrade['datesubmitted'] = null;
@ -5520,8 +5524,8 @@ class assign {
$mform->addHelpButton('gradedisabled', 'gradeoutofhelp', 'assign');
}
} else {
$grademenu = make_grades_menu($this->get_instance()->grade);
if (count($grademenu) > 0) {
$grademenu = array(-1 => get_string("nograde")) + make_grades_menu($this->get_instance()->grade);
if (count($grademenu) > 1) {
$gradingelement = $mform->addElement('select', 'grade', get_string('grade') . ':', $grademenu);
// The grade is already formatted with format_float so it needs to be converted back to an integer.