mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle
This commit is contained in:
commit
7c0313e414
@ -538,7 +538,7 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
|
||||
|
||||
// Trigger updating grades based on a given set of SCORM CMI elements.
|
||||
$scorm = false;
|
||||
if (strstr($element, '.score.raw') ||
|
||||
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw')) ||
|
||||
(in_array($element, array('cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'))
|
||||
&& in_array($track->value, array('completed', 'passed')))) {
|
||||
$scorm = $DB->get_record('scorm', array('id' => $scormid));
|
||||
@ -547,7 +547,7 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
|
||||
}
|
||||
|
||||
// Trigger CMI element events.
|
||||
if (strstr($element, '.score.raw') ||
|
||||
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw')) ||
|
||||
(in_array($element, array('cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'))
|
||||
&& in_array($track->value, array('completed', 'failed', 'passed')))) {
|
||||
if (!$scorm) {
|
||||
@ -560,7 +560,7 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
|
||||
'context' => context_module::instance($cm->id),
|
||||
'relateduserid' => $userid
|
||||
);
|
||||
if (strstr($element, '.score.raw')) {
|
||||
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw'))) {
|
||||
// Create score submitted event.
|
||||
$event = \mod_scorm\event\scoreraw_submitted::create($data);
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user