moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-79191' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Andrew Nicols 2023-09-05 10:32:48 +08:00
commit 0d6650a928
No known key found for this signature in database
GPG key ID: 6D1E3157C8CFBF14
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
course/classes/reportbuilder/local/entities/completion.php
View file

@ -273,11 +273,11 @@ class completion extends base {
LEFT JOIN {grade_grades} {$grade} LEFT JOIN {grade_grades} {$grade}
ON ({$user}.id = {$grade}.userid AND {$gradeitem}.id = {$grade}.itemid) ON ({$user}.id = {$grade}.userid AND {$gradeitem}.id = {$grade}.itemid)
") ")
->set_type(column::TYPE_INTEGER) ->set_type(column::TYPE_FLOAT)
->add_fields("{$grade}.finalgrade") ->add_fields("{$grade}.finalgrade")
->set_is_sortable(true) ->set_is_sortable(true)
->add_callback(function ($value) { ->add_callback(function(?float $value): string {
if (!$value) { if ($value === null) {
return ''; return '';
} }
return format_float($value, 2); return format_float($value, 2);

4
course/tests/reportbuilder/datasource/participants_test.php
View file

@ -139,7 +139,7 @@ class participants_test extends core_reportbuilder_testcase {
// Update final grade for the user. // Update final grade for the user.
$courseitem = grade_item::fetch_course_item($course->id); $courseitem = grade_item::fetch_course_item($course->id);
$courseitem->update_final_grade($user1->id, 80); $courseitem->update_final_grade($user1->id, 42.5);
// Set some last access value for the user in the course. // Set some last access value for the user in the course.
$DB->insert_record('user_lastaccess', $DB->insert_record('user_lastaccess',
@ -233,7 +233,7 @@ class participants_test extends core_reportbuilder_testcase {
'', // Reagreggate. '', // Reagreggate.
2, // Days taking course. 2, // Days taking course.
2, // Days until completion. 2, // Days until completion.
'80.00', // Grade. '42.50', // Grade.
], array_values($content[0])); ], array_values($content[0]));
} }