Merged from stable

This commit is contained in:
moodler 2004-11-26 15:42:05 +00:00
parent b64dab0e5d
commit 3f8eeff210
2 changed files with 22 additions and 28 deletions

View file

@ -570,7 +570,7 @@ function scorm_get_scoes_records($sco_user) {
{$CFG->prefix}user u {$CFG->prefix}user u
WHERE su.scormid = '$sco_user->scormid' WHERE su.scormid = '$sco_user->scormid'
AND su.userid = u.id AND su.userid = u.id
AND su.userid = $sco_user->userid AND su.userid = '$sco_user->userid'
ORDER BY scoid"); ORDER BY scoid");
} }

View file

@ -80,18 +80,13 @@
} }
foreach ($sco_users as $sco_user) { foreach ($sco_users as $sco_user) {
$user_data=scorm_get_scoes_records($sco_user); $user_data = scorm_get_scoes_records($sco_user);
$userpict = "";
if (isset($user_data->picture)) { $row = array();
$userpict = $user_data->picture;
}
$picture = print_user_picture($sco_user->userid, $course->id, $userpict, false, true);
$row="";
$row[] = $picture;
if (is_array($user_data)) {
$data = current($user_data); $data = current($user_data);
$row[] = "<a href=\"$CFG->wwwroot/user/view.php?id=$data->userid&amp;course=$course->id\">". $row[] = print_user_picture($sco_user->userid, $course->id, $data->picture, false, true);
fullname($data)."</a>"; $row[] = "<a href=\"$CFG->wwwroot/user/view.php?id=$data->userid&course=$course->id\">".
"$data->firstname $data->lastname</a>";
foreach ($user_data as $data) { foreach ($user_data as $data) {
$scoreview = ""; $scoreview = "";
if ($data->cmi_core_score_raw > 0) if ($data->cmi_core_score_raw > 0)
@ -100,10 +95,9 @@
$data->cmi_core_lesson_status = "not attempted"; $data->cmi_core_lesson_status = "not attempted";
$row[]="<img src=\"pix/".scorm_remove_spaces($data->cmi_core_lesson_status).".gif\" $row[]="<img src=\"pix/".scorm_remove_spaces($data->cmi_core_lesson_status).".gif\"
alt=\"".get_string(scorm_remove_spaces($data->cmi_core_lesson_status),"scorm")."\" alt=\"".get_string(scorm_remove_spaces($data->cmi_core_lesson_status),"scorm")."\"
title=\"".get_string(scorm_remove_spaces($data->cmi_core_lesson_status),"scorm")."\" />&nbsp;" title=\"".get_string(scorm_remove_spaces($data->cmi_core_lesson_status),"scorm")."\">&nbsp;"
.$data->cmi_core_total_time.$scoreview; .$data->cmi_core_total_time.$scoreview;
} }
}
$table->data[] = $row; $table->data[] = $row;
} }