L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-86593-500' of https://github.com/christianabila/moodle into MOODLE_500_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-12-12 09:46:24 +07:00
parent 917b9a0e32 4d8bcbece8
commit c0fefda2fc
2 changed files with 113 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/completionlib.php
+37 -28
View File
@@ -399,52 +399,61 @@ class completion_info {
/**
* Get course completion criteria
*
* @param int $criteriatype Specific criteria type to return (optional)
* @param int|null $criteriatype Specific criteria type to return (optional)
* @return array
*/
public function get_criteria($criteriatype = null) {
// Fill cache if empty
public function get_criteria(?int $criteriatype = null): array {
// Fill cache if empty.
if (!is_array($this->criteria)) {
global $DB;
$params = array(
'course' => $this->course->id
);
$params = ['course' => $this->course->id];
// Load criteria from database
$records = (array)$DB->get_records('course_completion_criteria', $params);
// Load criteria from database.
$records = $DB->get_records('course_completion_criteria', $params);
// Order records so activities are in the same order as they appear on the course view page.
if ($records) {
$activitiesorder = array_keys(get_fast_modinfo($this->course)->get_cms());
usort($records, function ($a, $b) use ($activitiesorder) {
$aidx = ($a->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) ?
array_search($a->moduleinstance, $activitiesorder) : false;
$bidx = ($b->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) ?
array_search($b->moduleinstance, $activitiesorder) : false;
if ($aidx === false || $bidx === false || $aidx == $bidx) {
return 0;
}
return ($aidx < $bidx) ? -1 : 1;
});
if (empty($records)) {
return [];
}
// Build array of criteria objects
$this->criteria = array();
// Order records so activities are in the same order as they appear on the course view page.
$activitiesorder = array_keys(get_fast_modinfo($this->course)->get_cms());
// Remove disabled modules.
foreach ($records as $key => $record) {
if ($record->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) {
if (!in_array($record->moduleinstance, $activitiesorder)) {
unset($records[$key]);
}
}
}
usort($records, function ($a, $b) use ($activitiesorder) {
$aidx = ($a->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) ?
array_search($a->moduleinstance, $activitiesorder) : false;
$bidx = ($b->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) ?
array_search($b->moduleinstance, $activitiesorder) : false;
if ($aidx === false || $bidx === false || $aidx == $bidx) {
return 0;
}
return ($aidx < $bidx) ? -1 : 1;
});
// Build array of criteria objects.
$this->criteria = [];
foreach ($records as $record) {
$this->criteria[$record->id] = completion_criteria::factory((array)$record);
}
}
// If after all criteria
// If after all criteria.
if ($criteriatype === null) {
return $this->criteria;
}
// If we are only after a specific criteria type
$criteria = array();
// If we are only after a specific criteria type.
$criteria = [];
foreach ($this->criteria as $criterion) {
if ($criterion->criteriatype != $criteriatype) {
continue;
}
lib/tests/completionlib_test.php
+76
View File
@@ -2295,6 +2295,82 @@ final class completionlib_test extends advanced_testcase {
$this->assertEquals($expectedcount, $completion->count_modules_completed($nonexistinguserid));
}
}
/**
* Disabled activities are not returned.
*
* @covers ::get_criteria
*/
public function test_disabled_activities_are_not_returned(): void {
global $DB;
$this->resetAfterTest();
$assignmodule = 'assign';
$bookmodule = 'book';
$pagemodule = 'page';
// Create a course with enabled completion tracking.
$course = $this->getDataGenerator()->create_course(['enablecompletion' => 1]);
// Add activities to the course and set completion conditions for the activities.
$assign = $this->getDataGenerator()->create_module(
$assignmodule,
['course' => $course->id, 'completion_assign' => COMPLETION_TRACKING_MANUAL],
);
$book = $this->getDataGenerator()->create_module(
$bookmodule,
['course' => $course->id, 'completion_book' => COMPLETION_TRACKING_MANUAL],
);
$page = $this->getDataGenerator()->create_module(
$pagemodule,
['course' => $course->id, 'completion_page' => COMPLETION_TRACKING_MANUAL],
);
// Add the activities as course completion criterias.
$DB->insert_record(
'course_completion_criteria',
[
'course' => $course->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY,
'module' => $assignmodule,
'moduleinstance' => $assign->cmid,
],
);
$DB->insert_record(
'course_completion_criteria',
[
'course' => $course->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY,
'module' => $bookmodule,
'moduleinstance' => $book->cmid,
],
);
$DB->insert_record(
'course_completion_criteria',
[
'course' => $course->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY,
'module' => $pagemodule,
'moduleinstance' => $page->cmid,
],
);
// Disable the book module.
$manager = core_plugin_manager::resolve_plugininfo_class('mod');
$manager::enable_plugin($bookmodule, 0);
// Calling get_criteria() should return only the 2 enabled activities.
// The disabled module should be filtered out.
$completioninfo = new completion_info($course);
$criteria = $completioninfo->get_criteria(COMPLETION_CRITERIA_TYPE_ACTIVITY);
$this->assertCount(2, $criteria);
}
}
class core_completionlib_fake_recordset implements Iterator {