mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-05-17 11:55:04 +02:00
commit dcc26efb70
6 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/data/lib.php
View File

@ -962,7 +962,15 @@ function data_user_outline($course, $user, $mod, $data) {
} else if ($grade) { } else if ($grade) {
$result = new stdClass(); $result = new stdClass();
$result->info = get_string('grade') . ': ' . $grade->str_long_grade; $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
//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; $result->time = $grade->dategraded;
} else {
$result->time = $grade->datesubmitted;
}
return $result; return $result;
} }
return NULL; return NULL;

8
mod/forum/lib.php
View File

@ -1131,7 +1131,15 @@ function forum_user_outline($course, $user, $mod, $forum) {
} else if ($grade) { } else if ($grade) {
$result = new stdClass(); $result = new stdClass();
$result->info = get_string('grade') . ': ' . $grade->str_long_grade; $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
//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; $result->time = $grade->dategraded;
} else {
$result->time = $grade->datesubmitted;
}
return $result; return $result;
} }
return NULL; return NULL;

8
mod/glossary/lib.php
View File

@ -243,7 +243,15 @@ function glossary_user_outline($course, $user, $mod, $glossary) {
} else if ($grade) { } else if ($grade) {
$result = new stdClass(); $result = new stdClass();
$result->info = get_string('grade') . ': ' . $grade->str_long_grade; $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
//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; $result->time = $grade->dategraded;
} else {
$result->time = $grade->datesubmitted;
}
return $result; return $result;
} }
return NULL; return NULL;

10
mod/lesson/lib.php
View File

@ -166,8 +166,14 @@ function lesson_user_outline($course, $user, $mod, $lesson) {
} else { } else {
$grade = reset($grades->items[0]->grades); $grade = reset($grades->items[0]->grades);
$return->info = get_string("grade") . ': ' . $grade->str_long_grade; $return->info = get_string("grade") . ': ' . $grade->str_long_grade;
$return->time = $grade->dategraded;
$return->info = get_string("no")." ".get_string("attempts", "lesson"); //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 $return; return $return;
} }

8
mod/quiz/lib.php
View File

@ -381,7 +381,15 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
$result = new stdClass; $result = new stdClass;
$result->info = get_string('grade') . ': ' . $grade->str_long_grade; $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
//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; $result->time = $grade->dategraded;
} else {
$result->time = $grade->datesubmitted;
}
return $result; return $result;
} }

8
mod/scorm/lib.php
View File

@ -294,7 +294,15 @@ function scorm_user_outline($course, $user, $mod, $scorm) {
$grade = reset($grades->items[0]->grades); $grade = reset($grades->items[0]->grades);
$result = new stdClass(); $result = new stdClass();
$result->info = get_string('grade') . ': '. $grade->str_long_grade; $result->info = get_string('grade') . ': '. $grade->str_long_grade;
//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; $result->time = $grade->dategraded;
} else {
$result->time = $grade->datesubmitted;
}
return $result; return $result;
} }
return null; return null;