diff --git a/mod/assign/mod_form.php b/mod/assign/mod_form.php index c4a39e8bea1..3fe7be35aab 100644 --- a/mod/assign/mod_form.php +++ b/mod/assign/mod_form.php @@ -284,6 +284,8 @@ class mod_assign_mod_form extends moodleform_mod { $mform =& $this->_form; $mform->addElement('checkbox', 'completionsubmit', '', get_string('completionsubmit', 'assign')); + // Enable this completion rule by default. + $mform->setDefault('completionsubmit', 1); return array('completionsubmit'); } diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php index 512c051c652..f0cbef905ac 100644 --- a/mod/choice/mod_form.php +++ b/mod/choice/mod_form.php @@ -161,6 +161,8 @@ class mod_choice_mod_form extends moodleform_mod { $mform =& $this->_form; $mform->addElement('checkbox', 'completionsubmit', '', get_string('completionsubmit', 'choice')); + // Enable this completion rule by default. + $mform->setDefault('completionsubmit', 1); return array('completionsubmit'); } diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php index 81bd89b61e0..2ad64a226ea 100644 --- a/mod/feedback/mod_form.php +++ b/mod/feedback/mod_form.php @@ -204,6 +204,8 @@ class mod_feedback_mod_form extends moodleform_mod { 'completionsubmit', '', get_string('completionsubmit', 'feedback')); + // Enable this completion rule by default. + $mform->setDefault('completionsubmit', 1); return array('completionsubmit'); } diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php index 34465e3a8b2..df87079db0f 100644 --- a/mod/forum/mod_form.php +++ b/mod/forum/mod_form.php @@ -243,14 +243,18 @@ class mod_forum_mod_form extends moodleform_mod { if (empty($default_values['completionreplies'])) { $default_values['completionreplies']=1; } - $default_values['completionpostsenabled']= - !empty($default_values['completionposts']) ? 1 : 0; + // Tick by default if Add mode or if completion posts settings is set to 1 or more. + if (empty($this->_instance) || !empty($default_values['completionposts'])) { + $default_values['completionpostsenabled'] = 1; + } else { + $default_values['completionpostsenabled'] = 0; + } if (empty($default_values['completionposts'])) { $default_values['completionposts']=1; } } - function add_completion_rules() { + function add_completion_rules() { $mform =& $this->_form; $group=array(); diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php index 670cfd78de3..14f6d54139c 100644 --- a/mod/glossary/mod_form.php +++ b/mod/glossary/mod_form.php @@ -174,10 +174,12 @@ class mod_glossary_mod_form extends moodleform_mod { } // Set up the completion checkboxes which aren't part of standard data. - // We also make the default value (if you turn on the checkbox) for those - // numbers to be 1, this will not apply unless checkbox is ticked. - $default_values['completionentriesenabled']= - !empty($default_values['completionentries']) ? 1 : 0; + // Tick by default if Add mode or if completion entries settings is set to 1 or more. + if (empty($this->_instance) || !empty($default_values['completionentries'])) { + $default_values['completionentriesenabled'] = 1; + } else { + $default_values['completionentriesenabled'] = 0; + } if (empty($default_values['completionentries'])) { $default_values['completionentries']=1; } diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php index 252c2b5c506..e3f168915d1 100644 --- a/mod/lesson/mod_form.php +++ b/mod/lesson/mod_form.php @@ -408,6 +408,8 @@ class mod_lesson_mod_form extends moodleform_mod { $mform->addElement('checkbox', 'completionendreached', get_string('completionendreached', 'lesson'), get_string('completionendreached_desc', 'lesson')); + // Enable this completion rule by default. + $mform->setDefault('completionendreached', 1); $group = array(); $group[] =& $mform->createElement('checkbox', 'completiontimespentenabled', '', diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php index b53d09a85af..dc62658a7d6 100644 --- a/mod/scorm/mod_form.php +++ b/mod/scorm/mod_form.php @@ -519,6 +519,10 @@ class mod_scorm_mod_form extends moodleform_mod { $firstkey = $key; } $mform->addElement('checkbox', $key, $name, $value); + // Default completion rule that requires the SCORM's status be set to "Completed". + if ($key === 'completionstatusrequired[4]') { + $mform->setDefault($key, 1); + } $mform->setType($key, PARAM_BOOL); $items[] = $key; } diff --git a/mod/survey/mod_form.php b/mod/survey/mod_form.php index d59d3c41d66..b8c58510663 100644 --- a/mod/survey/mod_form.php +++ b/mod/survey/mod_form.php @@ -76,6 +76,8 @@ class mod_survey_mod_form extends moodleform_mod { public function add_completion_rules() { $mform =& $this->_form; $mform->addElement('checkbox', 'completionsubmit', '', get_string('completionsubmit', 'survey')); + // Enable this completion rule by default. + $mform->setDefault('completionsubmit', 1); return array('completionsubmit'); }