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

MDL-37883 Assign offline marking: Properly handle french decimal grades when importing worksheet.

Browse Source
This commit is contained in:
Damyon Wiese 2013-02-06 15:09:02 +08:00
parent 0110cc2d49
commit 070d431771
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/assign/feedback/offline/importgradesform.php
View File

@ -109,6 +109,8 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re
} else {
$grade = '';
}
} else {
$grade = unformat_float($grade);
}
if ($usergrade && $usergrade->grade == $grade) {
@ -123,10 +125,9 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re
} else if ($assignment->grading_disabled($user->id)) {
// Skip grade is locked.
$skip = true;
} else if (!is_numeric($gradedesc) && ($assignment->get_instance()->grade) > -1) {
$skip = true;
} else if (($assignment->get_instance()->grade > -1) &&
(($gradedesc < 0) || ($gradedesc > $assignment->get_instance()->grade))) {
(($grade < 0) || ($grade > $assignment->get_instance()->grade))) {
// Out of range.
$skip = true;
}

6
mod/assign/feedback/offline/locallib.php
View File

@ -131,6 +131,8 @@ class assign_feedback_offline extends assign_feedback_plugin {
} else {
$record->grade = '';
}
} else {
$record->grade = unformat_float($record->grade);
}
// Note: Do not count the seconds when comparing modified dates.
@ -149,6 +151,10 @@ class assign_feedback_offline extends assign_feedback_plugin {
} else if ($this->assignment->grading_disabled($record->user->id)) {
// Skip grade is locked.
$skip = true;
} else if (($this->assignment->get_instance()->grade > -1) &&
(($record->grade < 0) || ($record->grade > $this->assignment->get_instance()->grade))) {
// Out of range.
$skip = true;
}
if (!$skip) {