moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-63422' of git://github.com/stronk7/moodle

Browse source
This commit is contained in:
Andrew Nicols 2018-11-02 08:22:33 +08:00
commit f8e364e31a
27 changed files with 79 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mod/scorm/lib.php
View file

@ -1778,30 +1778,27 @@ function mod_scorm_get_completion_active_rule_descriptions($cm) {
foreach ($cm->customdata['customcompletionrules'] as $key => $val) {
switch ($key) {
case 'completionstatusrequired':
if (is_null($val)) {
continue;
}
// Determine the selected statuses using a bitwise operation.
$cvalues = array();
foreach (scorm_status_options(true) as $bit => $string) {
if (($val & $bit) == $bit) {
$cvalues[] = $string;
if (!is_null($val)) {
// Determine the selected statuses using a bitwise operation.
$cvalues = array();
foreach (scorm_status_options(true) as $bit => $string) {
if (($val & $bit) == $bit) {
$cvalues[] = $string;
}
}
$statusstring = implode(', ', $cvalues);
$descriptions[] = get_string('completionstatusrequireddesc', 'scorm', $statusstring);
}
$statusstring = implode(', ', $cvalues);
$descriptions[] = get_string('completionstatusrequireddesc', 'scorm', $statusstring);
break;
case 'completionscorerequired':
if (is_null($val)) {
continue;
if (!is_null($val)) {
$descriptions[] = get_string('completionscorerequireddesc', 'scorm', $val);
}
$descriptions[] = get_string('completionscorerequireddesc', 'scorm', $val);
break;
case 'completionstatusallscos':
if (empty($val)) {
continue;
if (!empty($val)) {
$descriptions[] = get_string('completionstatusallscos', 'scorm');
}
$descriptions[] = get_string('completionstatusallscos', 'scorm');
break;
default:
break;
@ -1922,4 +1919,4 @@ function mod_scorm_core_calendar_get_valid_event_timestart_range(\calendar_event
}
return [$mindate, $maxdate];
}
}