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

Merge branch 'MDL-77055-master' of https://github.com/rmady/moodle

Browse source
This commit is contained in:
Huong Nguyen 2023-07-05 15:00:37 +07:00
commit 880fd8a253
No known key found for this signature in database
GPG key ID: 40D88AB693A3E72A
3 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mod/scorm/classes/external.php
View file

@ -742,9 +742,17 @@ class mod_scorm_external extends external_api {
} }
} }
$result = array(); $settings = [
$result['scorms'] = $returnedscorms; [
$result['warnings'] = $warnings; 'name' => 'scormstandard',
'value' => get_config('scorm', 'scormstandard'),
]
];
$result = [
'scorms' => $returnedscorms,
'options' => $settings,
'warnings' => $warnings
];
return $result; return $result;
} }
@ -813,6 +821,14 @@ class mod_scorm_external extends external_api {
] ]
), 'SCORM') ), 'SCORM')
), ),
'options' => new external_multiple_structure(
new external_single_structure(
[
'name' => new external_value(PARAM_RAW, 'Options name'),
'value' => new external_value(PARAM_RAW, 'Option value')
]
), 'Global SCORM options', VALUE_OPTIONAL
),
'warnings' => new external_warnings(), 'warnings' => new external_warnings(),
) )
); );

16
mod/scorm/tests/externallib_test.php
View file

@ -670,6 +670,12 @@ class externallib_test extends externallib_advanced_testcase {
$result = mod_scorm_external::get_scorms_by_courses(array($course1->id)); $result = mod_scorm_external::get_scorms_by_courses(array($course1->id));
$result = external_api::clean_returnvalue($returndescription, $result); $result = external_api::clean_returnvalue($returndescription, $result);
// Test default SCORM settings.
$this->assertCount(1, $result['options']);
$this->assertEquals('scormstandard', $result['options'][0]['name']);
$this->assertEquals(0, $result['options'][0]['value']);
$this->assertCount(1, $result['warnings']); $this->assertCount(1, $result['warnings']);
// Only 'id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles'. // Only 'id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles'.
$this->assertCount(8, $result['scorms'][0]); $this->assertCount(8, $result['scorms'][0]);
@ -679,8 +685,17 @@ class externallib_test extends externallib_advanced_testcase {
$scorm1->timeclose = $scorm1->timeopen + DAYSECS; $scorm1->timeclose = $scorm1->timeopen + DAYSECS;
$DB->update_record('scorm', $scorm1); $DB->update_record('scorm', $scorm1);
// Set the SCORM config values.
set_config('scormstandard', 1, 'scorm');
$result = mod_scorm_external::get_scorms_by_courses(array($course1->id)); $result = mod_scorm_external::get_scorms_by_courses(array($course1->id));
$result = external_api::clean_returnvalue($returndescription, $result); $result = external_api::clean_returnvalue($returndescription, $result);
// Test SCORM settings.
$this->assertCount(1, $result['options']);
$this->assertEquals('scormstandard', $result['options'][0]['name']);
$this->assertEquals(1, $result['options'][0]['value']);
$this->assertCount(1, $result['warnings']); $this->assertCount(1, $result['warnings']);
// Only 'id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles'. // Only 'id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles'.
$this->assertCount(8, $result['scorms'][0]); $this->assertCount(8, $result['scorms'][0]);
@ -780,6 +795,7 @@ class externallib_test extends externallib_advanced_testcase {
// Call for the second course we unenrolled the user from, expected warning. // Call for the second course we unenrolled the user from, expected warning.
$result = mod_scorm_external::get_scorms_by_courses(array($course2->id)); $result = mod_scorm_external::get_scorms_by_courses(array($course2->id));
$this->assertCount(1, $result['options']);
$this->assertCount(1, $result['warnings']); $this->assertCount(1, $result['warnings']);
$this->assertEquals('1', $result['warnings'][0]['warningcode']); $this->assertEquals('1', $result['warnings'][0]['warningcode']);
$this->assertEquals($course2->id, $result['warnings'][0]['itemid']); $this->assertEquals($course2->id, $result['warnings'][0]['itemid']);

3
mod/scorm/upgrade.txt
View file

@ -1,5 +1,8 @@
This files describes API changes in the mod_scorm code. This files describes API changes in the mod_scorm code.
=== 4.3 ===
* Add SCORM options in get_scorms_by_courses() external/ws function.
=== 4.0 === === 4.0 ===
* Setting 'displayactivityname' has been removed from scorm. This will be handled by activityheader and is theme dependent. * Setting 'displayactivityname' has been removed from scorm. This will be handled by activityheader and is theme dependent.