Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle

2011-05-17 11:55:04 +02:00
parent 14c3fd5f83 4433f871f2
commit dcc26efb70
6 changed files with 53 additions and 7 deletions
@@ -962,7 +962,15 @@ function data_user_outline($course, $user, $mod, $data) {
    } else if ($grade) {
        $result = new stdClass();
        $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-        $result->time = $grade->dategraded;
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
+
        return $result;
    }
    return NULL;