From 7688a3191c490202dd796021d325f15056649926 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 13 Feb 2013 14:54:24 +0800 Subject: [PATCH] MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export. --- mod/assign/feedback/offline/importgradesform.php | 3 +-- mod/assign/gradingtable.php | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mod/assign/feedback/offline/importgradesform.php b/mod/assign/feedback/offline/importgradesform.php index 9eea55cf1a2..e3ac2e49a45 100644 --- a/mod/assign/feedback/offline/importgradesform.php +++ b/mod/assign/feedback/offline/importgradesform.php @@ -88,7 +88,6 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re while ($record = $gradeimporter->next()) { $user = $record->user; $grade = $record->grade; - $gradedesc = $grade; $modified = $record->modified; $userdesc = fullname($user); if ($assignment->is_blind_marking()) { @@ -134,7 +133,7 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re if (!$skip) { $update = true; $updates[] = get_string('gradeupdate', 'assignfeedback_offline', - array('grade'=>$gradedesc, 'student'=>$userdesc)); + array('grade'=>format_float($grade, 2), 'student'=>$userdesc)); } if ($ignoremodified || !$stalemodificationdate) { diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index 44c392c97c7..526ae857b09 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -414,7 +414,7 @@ class assign_grading_table extends table_sql implements renderable { if ($grade == -1 || $grade === null) { return ''; } - return format_float($grade); + return format_float($grade, 2); } else { // This is a custom scale. $scale = $this->assignment->display_grade($grade, false); @@ -661,6 +661,10 @@ class assign_grading_table extends table_sql implements renderable { if ($row->timemarked && $row->grade !== null && $row->grade >= 0) { $o = userdate($row->timemarked); } + if ($row->timemarked && $this->is_downloading()) { + // Force it for downloads as it affects import. + $o = userdate($row->timemarked); + } return $o; } -- 2.43.0