L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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-21 16:51:33 +11:00
committed by Marina Glancy
parent a322a0ab53
commit a10d621fc5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradeform.php
+1 -1
View File
@@ -95,7 +95,7 @@ class mod_assign_grade_form extends moodleform {
// this is a scale
if ($scale = $DB->get_record('scale', array('id'=>-($this->assignment->get_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');
}
}
mod/assign/locallib.php
+7 -3
View File
@@ -3110,6 +3110,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;
@@ -4243,9 +4247,9 @@ class assign {
$mform->addHelpButton('gradedisabled', 'gradeoutofhelp', 'assign');
}
} else {
$grademenu = make_grades_menu($this->get_instance()->grade);
if (count($grademenu) > 0) {
$gradingelement = $mform->addElement('select', 'grade', get_string('grade').':', $grademenu);
$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.
if (!empty($data->grade)) {