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

Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-02-13 15:47:27 +08:00
commit 583b20abd7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {

6
mod/assign/gradingtable.php
View File

@ -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;
}