mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-58138 completion: changes after rebasing

Browse Source 
The defaults for the completion have been changed in MDL-55611
This commit is contained in:
Marina Glancy 2017-04-05 13:04:13 +08:00 committed by Jake Dallimore
parent 61167c16d0
commit 32b93ea7f8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
completion/classes/manager.php
View File

@ -457,6 +457,7 @@ class manager {
$completion = new \completion_info(get_fast_modinfo($course->id)->get_course());
if ($completion->is_enabled() && plugin_supports('mod', $module->name, FEATURE_MODEDIT_DEFAULT_COMPLETION, true)) {
$data->completion = COMPLETION_TRACKING_MANUAL;
$data->completionview = 1;
}
}
}

9
completion/tests/behat/default_activity_completion.feature
View File

@ -38,10 +38,11 @@ Feature: Allow teachers to bulk edit activity completion rules in a course.
And I should see "Completion tracking"
And I should see "The changes will affect the following 1 Activities/Resources"
And I should see "Student must submit to this activity to complete it"
And I select "Show activity as complete when conditions are met" from the "completion" singleselect
And I click on "completionview" "checkbox"
And I click on "completionusegrade" "checkbox"
And I click on "completionsubmit" "checkbox"
And I set the following fields to these values:
| completion | Show activity as complete when conditions are met|
| completionview | 1 |
| completionusegrade | 1 |
| completionsubmit | 1 |
And I click on "Save changes" "button"
Then I should see "Changes saved"
And I should see "With conditions" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Assignments']]" "xpath_element"

2
mod/assign/mod_form.php
View File

@ -283,7 +283,7 @@ class mod_assign_mod_form extends moodleform_mod {
public function add_completion_rules() {
$mform =& $this->_form;
$mform->addElement('checkbox', 'completionsubmit', '', get_string('completionsubmit', 'assign'));
$mform->addElement('advcheckbox', 'completionsubmit', '', get_string('completionsubmit', 'assign'));
// Enable this completion rule by default.
$mform->setDefault('completionsubmit', 1);
return array('completionsubmit');