mirror of
https://github.com/moodle/moodle.git
synced 2025-08-09 19:06:41 +02:00
Merge branch 'master_MDL-27366' of git://github.com/danmarsden/moodle
This commit is contained in:
commit
9192e9fe45
1 changed files with 5 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue