From 8acaa4e356a9ea16fb2acc8e104f2f31288a2d99 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 8 Jun 2020 22:39:43 +0100 Subject: [PATCH] MDL-68715 completion: fix form default value for course prerequisites. Adds filtering on the completion criteria form to ensure we are only selecting actual course instances of this type. Prior to this change we would also get NULL values from unrelated criteria types. --- .../behat/completion_other_courses.feature | 30 +++++++++++++++++++ course/completion_form.php | 6 ++-- lib/db/upgrade.php | 11 +++++++ version.php | 2 +- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 completion/tests/behat/completion_other_courses.feature diff --git a/completion/tests/behat/completion_other_courses.feature b/completion/tests/behat/completion_other_courses.feature new file mode 100644 index 00000000000..66765b0954a --- /dev/null +++ b/completion/tests/behat/completion_other_courses.feature @@ -0,0 +1,30 @@ +@core @core_completion +Feature: Set completion of other courses as criteria for completion of current course + In order to set completion of other courses as criteria for completion of current course + As a user + I want to select the prerequisite courses in completion settings + + Background: + Given the following "courses" exist: + | fullname | shortname | category | enablecompletion | + | Course 1 | C1 | 0 | 1 | + | Course 2 | C2 | 0 | 1 | + And the following "users" exist: + | username | firstname | lastname | email | + | student1 | Student | One | student1@example.com | + And the following "course enrolments" exist: + | user | course | role | + | student1 | C1 | student | + + @javascript + Scenario: Set completion of prerequisite course as completion criteria of current course + When I log in as "admin" + And I am on "Course 1" course homepage with editing mode on + And I navigate to "Course completion" in current page administration + And I click on "Condition: Completion of other courses" "link" + And I set the field "Courses available" to "Course 2" + And I press "Save changes" + And I add the "Course completion status" block + And I click on "View course report" "link" in the "Course completion status" "block" + Then I should see "Course 2" in the "completion-progress" "table" + And I should see "Student One" in the "completion-progress" "table" diff --git a/course/completion_form.php b/course/completion_form.php index f8501011c90..937a0eee150 100644 --- a/course/completion_form.php +++ b/course/completion_form.php @@ -128,14 +128,16 @@ class course_completion_form extends moodleform { } // Get applicable courses (prerequisites). - $selectedcourses = $DB->get_fieldset_sql("SELECT cc.courseinstance - FROM {course_completion_criteria} cc WHERE cc.course = ?", [$course->id]); $hasselectablecourses = core_course_category::search_courses(['onlywithcompletion' => true], ['limit' => 2]); unset($hasselectablecourses[$course->id]); if ($hasselectablecourses) { // Show multiselect box. $mform->addElement('course', 'criteria_course', get_string('coursesavailable', 'completion'), array('multiple' => 'multiple', 'onlywithcompletion' => true, 'exclude' => $course->id)); + $mform->setType('criteria_course', PARAM_INT); + + $selectedcourses = $DB->get_fieldset_select('course_completion_criteria', 'courseinstance', + 'course = :course AND criteriatype = :type', ['course' => $course->id, 'type' => COMPLETION_CRITERIA_TYPE_COURSE]); $mform->setDefault('criteria_course', $selectedcourses); // Map aggregation methods to context-sensitive human readable dropdown menu. diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 977d7dfa264..b0ccb2a922c 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2498,5 +2498,16 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2020062600.01); } + if ($oldversion < 2020071100.01) { + // Clean up completion criteria records referring to NULL course prerequisites. + $select = 'criteriatype = :type AND courseinstance IS NULL'; + $params = ['type' => 8]; // COMPLETION_CRITERIA_TYPE_COURSE. + + $DB->delete_records_select('course_completion_criteria', $select, $params); + + // Main savepoint reached. + upgrade_main_savepoint(true, 2020071100.01); + } + return true; } diff --git a/version.php b/version.php index 780518568f9..10026f0485e 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2020071100.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2020071100.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.0dev (Build: 20200711)'; // Human-friendly version name -- 2.17.1