diff --git a/mod/scorm/backup/moodle2/backup_scorm_stepslib.php b/mod/scorm/backup/moodle2/backup_scorm_stepslib.php index 6bfef2fe8fa..86957497dcb 100644 --- a/mod/scorm/backup/moodle2/backup_scorm_stepslib.php +++ b/mod/scorm/backup/moodle2/backup_scorm_stepslib.php @@ -45,7 +45,8 @@ class backup_scorm_activity_structure_step extends backup_activity_structure_ste 'skipview', 'hidebrowse', 'hidetoc', 'nav', 'navpositionleft', 'navpositiontop', 'auto', 'popup', 'options', 'width', 'height', 'timeopen', 'timeclose', 'timemodified', - 'completionstatusrequired', 'completionscorerequired')); + 'completionstatusrequired', 'completionscorerequired', + 'displayactivityname')); $scoes = new backup_nested_element('scoes'); diff --git a/mod/scorm/db/install.xml b/mod/scorm/db/install.xml index 6661d0f0c68..09551f7c7b2 100644 --- a/mod/scorm/db/install.xml +++ b/mod/scorm/db/install.xml @@ -1,5 +1,5 @@ - @@ -44,6 +44,7 @@ + diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php index 7275d42bd42..b7dd657ba1f 100644 --- a/mod/scorm/db/upgrade.php +++ b/mod/scorm/db/upgrade.php @@ -251,6 +251,30 @@ function xmldb_scorm_upgrade($oldversion) { upgrade_mod_savepoint(true, 2014021700, 'scorm'); } + + if ($oldversion < 2014031700) { + // Define field displayactivityname to be added to scorm. + $table = new xmldb_table('scorm'); + $field = new xmldb_field( + 'displayactivityname', + XMLDB_TYPE_INTEGER, + '4', + null, + XMLDB_NOTNULL, + null, + '1', + 'completionscorerequired' + ); + + // Conditionally launch add field displayactivityname. + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + } + + // Scorm savepoint reached. + upgrade_mod_savepoint(true, 2014031700, 'scorm'); + } + return true; } diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index 65a4a0a2148..d953af127b3 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -94,6 +94,8 @@ $string['details'] = 'Track details'; $string['directories'] = 'Show the directory links'; $string['disabled'] = 'Disabled'; $string['display'] = 'Display package'; +$string['displayactivityname'] = 'Display activity name'; +$string['displayactivityname_help'] = 'Whether or not to display the activity name.'; $string['displayattemptstatus'] = 'Display attempt status'; $string['displayattemptstatus_help'] = 'This preference allows a summary of the users attempts to show in the course overview block in My home and/or the SCORM entry page.'; $string['displayattemptstatusdesc'] = 'Whether a summary of the user\'s attempts is shown in the course overview block in My home and/or the SCORM entry page.'; diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php index e7dc5bd4d02..f363799e8da 100644 --- a/mod/scorm/mod_form.php +++ b/mod/scorm/mod_form.php @@ -130,6 +130,10 @@ class mod_scorm_mod_form extends moodleform_mod { $mform->disabledIf('winoptgrp', 'popup', 'eq', 0); $mform->setAdvanced('winoptgrp', $cfgscorm->winoptgrp_adv); + // Display activity name. + $mform->addElement('advcheckbox', 'displayactivityname', get_string('displayactivityname', 'scorm')); + $mform->addHelpButton('displayactivityname', 'displayactivityname', 'scorm'); + // Skip view page. $skipviewoptions = scorm_get_skip_view_array(); if ($COURSE->format == 'singleactivity') { // Remove option that would cause a constant redirect. @@ -337,7 +341,6 @@ class mod_scorm_mod_form extends moodleform_mod { if (!isset($defaultvalues['completionscorerequired']) || !strlen($defaultvalues['completionscorerequired'])) { $defaultvalues['completionscoredisabled'] = 1; } - } public function validation($data, $files) { diff --git a/mod/scorm/player.php b/mod/scorm/player.php index bc584a179c0..fad2c471cf1 100644 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -166,7 +166,9 @@ $PAGE->requires->data_for_js('scormplayerdata', Array('launch' => false, $PAGE->requires->js('/mod/scorm/request.js', true); $PAGE->requires->js('/lib/cookies.js', true); echo $OUTPUT->header(); -echo $OUTPUT->heading(format_string($scorm->name)); +if ($scorm->displayactivityname) { + echo $OUTPUT->heading(format_string($scorm->name)); +} $PAGE->requires->string_for_js('navigation', 'scorm'); $PAGE->requires->string_for_js('toc', 'scorm'); diff --git a/mod/scorm/version.php b/mod/scorm/version.php index ff6a84776fa..f7188195be0 100644 --- a/mod/scorm/version.php +++ b/mod/scorm/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2014021701; // The current module version (Date: YYYYMMDDXX) -$plugin->requires = 2013110500; // Requires this Moodle version -$plugin->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics) -$plugin->cron = 300; +$module->version = 2014031700; // The current module version (Date: YYYYMMDDXX). +$module->requires = 2013110500; // Requires this Moodle version. +$module->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics). +$module->cron = 300;