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

This commit is contained in:
Eloy Lafuente (stronk7) 2012-10-09 00:02:41 +02:00
commit 5d3559f7b5
5 changed files with 29 additions and 5 deletions

View file

@ -41,6 +41,12 @@ define('SCORM_12', 1);
define('SCORM_13', 2);
define('SCORM_AICC', 3);
// List of possible attemptstatusdisplay options.
define('SCORM_DISPLAY_ATTEMPTSTATUS_NO', 0);
define('SCORM_DISPLAY_ATTEMPTSTATUS_ALL', 1);
define('SCORM_DISPLAY_ATTEMPTSTATUS_MY', 2);
define('SCORM_DISPLAY_ATTEMPTSTATUS_ENTRY', 3);
/**
* Return an array of status options
*
@ -1093,7 +1099,8 @@ function scorm_print_overview($courses, &$htmlarray) {
if ($scorm->timeclose) {
$str .= '<div class="info">'.$strduedate.': '.userdate($scorm->timeclose).'</div>';
}
if ($scorm->displayattemptstatus == 1) {
if ($scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ALL ||
$scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_MY) {
require_once($CFG->dirroot.'/mod/scorm/locallib.php');
$str .= '<div class="details">'.scorm_get_attempt_status($USER, $scorm).'</div>';
}
@ -1346,4 +1353,4 @@ function scorm_set_completion($scorm, $userid, $completionstate = COMPLETION_COM
$completion->update_state($cm, $completionstate, $userid);
}
}
}
}