Merge branch 'master_MDL-27366' of git://github.com/danmarsden/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-20 23:38:47 +02:00
commit 9192e9fe45

View file

@ -1036,7 +1036,7 @@ function scorm_print_overview($courses, &$htmlarray) {
if ($scorm->timeopen) { if ($scorm->timeopen) {
$isopen = ($scorm->timeopen <= $time && $time <= $scorm->timeclose); $isopen = ($scorm->timeopen <= $time && $time <= $scorm->timeclose);
} }
if (empty($isopen) || empty($scorm->timeclose)) { if (empty($scorm->displayattemptstatus) && (empty($isopen) || empty($scorm->timeclose))) {
unset($scorms[$key]); unset($scorms[$key]);
}else{ }else{
$scormids[] = $scorm->id; $scormids[] = $scorm->id;
@ -1059,7 +1059,10 @@ function scorm_print_overview($courses, &$htmlarray) {
if ($scorm->timeclose) { if ($scorm->timeclose) {
$str .= '<div class="info">'.$strduedate.': '.userdate($scorm->timeclose).'</div>'; $str .= '<div class="info">'.$strduedate.': '.userdate($scorm->timeclose).'</div>';
} }
if ($scorm->displayattemptstatus == 1) {
require_once($CFG->dirroot.'/mod/scorm/locallib.php');
$str .= '<div class="details">'.scorm_get_attempt_status($USER, $scorm).'</div>';
}
$str .= '</div>'; $str .= '</div>';
if (empty($htmlarray[$scorm->course]['scorm'])) { if (empty($htmlarray[$scorm->course]['scorm'])) {
$htmlarray[$scorm->course]['scorm'] = $str; $htmlarray[$scorm->course]['scorm'] = $str;