mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-82775-main' of https://github.com/dpalou/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-10-28 14:11:29 +07:00
commit 49e299df29
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.upgradenotes/MDL-82775-2024082908150378.yml Normal file
View File

@ -0,0 +1,7 @@
issueNumber: MDL-82775
notes:
mod_h5pactivity:
- message: >-
The external function get_user_attempts now returns the total number of
attempts.
type: changed

2
mod/h5pactivity/classes/external/get_user_attempts.php vendored
View File

@ -149,6 +149,7 @@ class get_user_attempts extends external_api {
$result = (object)[
'activityid' => $instance->id,
'usersattempts' => $usersattempts,
'totalattempts' => $manager->count_attempts(),
'warnings' => $warnings,
];
@ -255,6 +256,7 @@ class get_user_attempts extends external_api {
'usersattempts' => new external_multiple_structure(
self::get_user_attempts_returns(), 'The complete users attempts list'
),
'totalattempts' => new external_value(PARAM_INT, 'Total number of attempts'),
'warnings' => new external_warnings(),
], 'Activity attempts data');
}

3
mod/h5pactivity/tests/external/get_user_attempts_test.php vendored
View File

@ -80,6 +80,7 @@ class get_user_attempts_test extends externallib_advanced_testcase {
$generator = $this->getDataGenerator()->get_plugin_generator('mod_h5pactivity');
$attemptcount = 1;
$totalattempts = 0;
foreach ($users as $key => $user) {
if (($key == 'noattempts') || ($key == 'noenrolled') || ($key == 'editingteacher')) {
$countattempts[$user->id] = 0;
@ -87,6 +88,7 @@ class get_user_attempts_test extends externallib_advanced_testcase {
$params = ['cmid' => $cm->id, 'userid' => $user->id];
for ($i = 1; $i <= $attemptcount; $i++) {
$generator->create_content($activity, $params);
$totalattempts++;
}
$countattempts[$user->id] = $attemptcount;
$attemptcount++;
@ -107,6 +109,7 @@ class get_user_attempts_test extends externallib_advanced_testcase {
$result
);
$this->assertEquals($totalattempts, $result['totalattempts']);
$this->assertCount(count($warnings), $result['warnings']);
// Teacher is excluded.
$this->assertCount(count($resultusers), $result['usersattempts']);