L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mdl30_MDL-46903' of https://github.com/danmarsden/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-11-04 08:25:04 +08:00
parent dbda3be673 7540ee5e5e
commit d8ff21935d
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/report/objectives/classes/report.php
+17 -8
View File
@@ -491,17 +491,25 @@ class report extends \mod_scorm\report {
$row[] = $score;
}
// Iterate over tracks and match objective id against values.
$keywords = array("cmi.objectives_", ".id");
$scorm2004 = false;
if (scorm_version_check($scorm->version, SCORM_13)) {
$scorm2004 = true;
$objectiveprefix = "cmi.objectives.";
} else {
$objectiveprefix = "cmi.objectives_";
}
$keywords = array(".id", $objectiveprefix);
$objectivestatus = array();
$objectivescore = array();
foreach ($trackdata as $name => $value) {
if (strpos($name, 'cmi.objectives_') === 0 && strrpos($name, '.id') !== false) {
if (strpos($name, $objectiveprefix) === 0 && strrpos($name, '.id') !== false) {
$num = trim(str_ireplace($keywords, '', $name));
if (is_numeric($num)) {
if (scorm_version_check($scorm->version, SCORM_13)) {
$element = 'cmi.objectives_'.$num.'.completion_status';
if ($scorm2004) {
$element = $objectiveprefix.$num.'.completion_status';
} else {
$element = 'cmi.objectives_'.$num.'.status';
$element = $objectiveprefix.$num.'.status';
}
if (isset($trackdata->$element)) {
$objectivestatus[$value] = $trackdata->$element;
@@ -509,7 +517,7 @@ class report extends \mod_scorm\report {
$objectivestatus[$value] = '';
}
if ($displayoptions['objectivescore']) {
$element = 'cmi.objectives_'.$num.'.score.raw';
$element = $objectiveprefix.$num.'.score.raw';
if (isset($trackdata->$element)) {
$objectivescore[$value] = $trackdata->$element;
} else {
@@ -648,8 +656,9 @@ function get_scorm_objectives($scormid) {
$select = "scormid = ? AND ";
$select .= $DB->sql_like("element", "?", false);
$params[] = $scormid;
$params[] = "cmi.objectives_%.id";
$rs = $DB->get_recordset_select("scorm_scoes_track", $select, $params, 'value', 'DISTINCT value, scoid');
$params[] = "cmi.objectives%.id";
$value = $DB->sql_compare_text('value');
$rs = $DB->get_recordset_select("scorm_scoes_track", $select, $params, $value, "DISTINCT $value, scoid");
if ($rs->valid()) {
foreach ($rs as $record) {
$objectives[$record->scoid][] = $record->value;