Skip to content

Commit

Permalink
Field Consistency & Bugfixes (#69)
Browse files Browse the repository at this point in the history 
* require context language

* refactor default context

* ensure objectType, also message id fixes
  • Loading branch information
@milt
milt authored Dec 4, 2024
1 parent 29b32a3 commit a7fc6a2
Show file tree
Hide file tree
Showing 317 changed files with 1,840 additions and 1,099 deletions.
4 changes: 2 additions & 2 deletions src/transformer/events/core/badge_awarded.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ function badge_awarded(array $config, \stdClass $event) {
'display' => [
'en' => 'Achieved'
]],
'object' => utils\badge_object($config, $lang, $badge),
'object' => utils\get_activity\badge($config, $lang, $badge),
'result' => [
'response' => $badge->message
],
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'instructor' => $awarder,
'contextActivities' => [
'category' => [[
Expand Down
4 changes: 2 additions & 2 deletions src/transformer/events/core/badge_revoked.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ function badge_revoked(array $config, \stdClass $event) {
'en' => 'Forfeited'
],
],
'object' => utils\badge_object($config, $lang, $badge),
'object' => utils\get_activity\badge($config, $lang, $badge),
'context' => [
'language'=>$lang,
...utils\get_context_base($config, $event, $lang, $course),
'instructor' =>$revoker,
'contextActivities'=> [
'category' => [[
Expand Down
5 changes: 2 additions & 3 deletions src/transformer/events/core/badge_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,14 @@ function badge_updated(array $config, \stdClass $event) {
'en' => 'Edited'
]
],
'object' => utils\badge_object($config, $lang, $badge),
'object' => utils\get_activity\badge($config, $lang, $badge),
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
activity\site($config)
],
],
'extensions' => utils\extensions\base($config, $event, $course)
]];

if ($course){
Expand Down
9 changes: 4 additions & 5 deletions src/transformer/events/core/badge_viewed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function badge_viewed(array $config, \stdClass $event) {
$badge = $repo->read_record_by_id('badge', $event->objectid);

//all three here may not exist
$user=$repo->read_record_by_id('user',$event->userid);
$user=$repo->read_record_by_id('user',$event->userid);
$course = (isset($event->courseid) && $event->courseid != 0)
? $repo->read_record_by_id('course', $event->courseid)
: null;
Expand All @@ -56,18 +56,17 @@ function badge_viewed(array $config, \stdClass $event) {
'verb' => ['id' => 'http://id.tincanapi.com/verb/viewed',
'display' => ['en' => 'Viewed']
],
'object' => utils\badge_object($config, $lang, $badge),
'object' => utils\get_activity\badge($config, $lang, $badge),
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)],
],
'extensions' => utils\extensions\base($config, $event, $course)
]];

if ($course){
$statement = utils\add_parent($config,$statement,$course);
}

return [$statement];
}
17 changes: 8 additions & 9 deletions src/transformer/events/core/calendar_event_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,14 @@ function calendar_event_created(array $config, \stdClass $event) {
'en' => 'Created'
],
],
'object' => [
'id' => $config['app_url'].'/calendar/view?id='.$event->objectid,
'definition' => [
'type' => 'https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event',
'name' => [$lang => $event_object->name]
]
],
'object' => activity\calendar_event(
$config,
$lang,
$event->objectid,
$event_object->name
),
'context' => [
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)]
]
Expand All @@ -67,6 +66,6 @@ function calendar_event_created(array $config, \stdClass $event) {
if ($course){
$statement = utils\add_parent($config,$statement,$course);
}

return [$statement];
}
22 changes: 10 additions & 12 deletions src/transformer/events/core/calendar_event_deleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @package logstore_xapi
* @copyright Daniel Bell <[email protected]>
*
*
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -37,35 +37,33 @@
*/

function calendar_event_deleted(array $config, \stdClass $event) {
global $CFG;
$repo = $config['repo'];

//all three here may not exist
$user=$repo->read_record_by_id('user',$event->userid);
$user=$repo->read_record_by_id('user',$event->userid);
$course = (isset($event->courseid) && $event->courseid != 0) ? $repo->read_record_by_id("course", $event->courseid) : null;
$lang = utils\get_course_lang(($course ? $course : $repo->read_record_by_id("course",1)));

$statement = [
'actor' => utils\get_user($config,$user),
'verb' => ['id' => 'http://activitystrea.ms/delete',
'display' => ['en' => 'Deleted']],
'object' => [
'id' => $config['app_url'].'/calendar/view?id='.$event->objectid,
'definition' => [
'name' => [$lang => unserialize($event->other)['name']],
'type' => 'https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event'],
],
'object' => activity\calendar_event(
$config,
$lang,
$event->objectid,
unserialize($event->other)['name']
),
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)]
],
'extensions' => utils\extensions\base($config, $event, $course)
]];

if ($course){
$statement = utils\add_parent($config,$statement,$course);
}

return [$statement];
}
19 changes: 8 additions & 11 deletions src/transformer/events/core/calendar_event_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,14 @@ function calendar_event_updated(array $config, \stdClass $event) {
'id' => 'https://w3id.org/xapi/acrossx/verbs/edited',
'display' => ['en'=> 'Edited']
],
'object' => [
'id'=> $config['app_url'].'/calendar/view.php?id='.$event->objectid,
'definition' => [
'type' => 'https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event',
'name' => [
$lang => $event_object->name
]
]
],
'object' => activity\calendar_event(
$config,
$lang,
$event->objectid,
$event_object->name
),
'context' => [
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)]
]
Expand All @@ -66,7 +63,7 @@ function calendar_event_updated(array $config, \stdClass $event) {


if ($course){
$statement = utils\add_parent($config,$statement,$course);
$statement = utils\add_parent($config,$statement,$course);
}

return [$statement];
Expand Down
3 changes: 1 addition & 2 deletions src/transformer/events/core/calendar_subscription_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ function calendar_subscription_created(array $config, \stdClass $event) {
$config, $event->objectid, $lang, $subscription->name
),
'context'=> [
'language' => $lang,
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
utils\get_activity\site($config),
Expand Down
3 changes: 1 addition & 2 deletions src/transformer/events/core/calendar_subscription_deleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ function calendar_subscription_deleted(array $config, \stdClass $event) {
$config, $event->objectid, $lang
),
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)],
],
'extensions' => utils\extensions\base($config, $event, $course)
]];

if ($course){
Expand Down
3 changes: 1 addition & 2 deletions src/transformer/events/core/calendar_subscription_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ function calendar_subscription_updated(array $config, \stdClass $event) {
$config, $event->objectid, $lang, $subscription->name
),
'context' => [
'language' => $lang,
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [activity\site($config)],
],
'extensions' => utils\extensions\base($config, $event, $course)
]];

if ($course){
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_category_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function course_category_created(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_category($config, $category),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang),
'contextActivities' => [
'parent' => [
utils\get_activity\course_category($config, $parent_category),
Expand Down
3 changes: 1 addition & 2 deletions src/transformer/events/core/course_completed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ function course_completed(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course($config, $course),
'context' => [
'language' => $lang,
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
utils\get_activity\site($config)
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_completion_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function course_completion_updated(array $config, \stdClass $event) {
],
],
'context' => [
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function course_created(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course($config, $course),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
utils\get_activity\site($config),
Expand Down
5 changes: 2 additions & 3 deletions src/transformer/events/core/course_module_completion_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function course_module_completion_updated(array $config, \stdClass $event) {
'en' => 'Completed'
],
];

// completionstate: 1=completion, 2=pass, 3=fail
$result['completion'] = true;
if ($completionstate > 1) {
Expand All @@ -76,8 +76,7 @@ function course_module_completion_updated(array $config, \stdClass $event) {
$event->contextinstanceid
),
'context' => [
'language' => $lang,
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => utils\context_activities\get_parent(
$config,
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_module_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function course_module_created(array $config, \stdClass $event) {
$event->contextinstanceid
),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => utils\context_activities\get_parent(
$config,
Expand Down
13 changes: 2 additions & 11 deletions src/transformer/events/core/course_resources_list_viewed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,9 @@ function course_resources_list_viewed(array $config, \stdClass $event) {
'en' => 'Viewed'
],
],
'object' => [
'id' => $config['app_url'] . '/course/resources.php?id=' . $event->courseid,
'definition' => [
'type' => 'https://w3id.org/xapi/acrossx/activities/webpage',
'name' => [
$lang => $course->fullname . ' Resources'
],
],
],
'object' => utils\get_activity\course_resources_list($config, $course),
'context' => [
'language' => $lang,
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_section_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function course_section_created(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_section($config, $course, $event->objectid),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/course_updated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function course_updated(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course($config, $course),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
utils\get_activity\site($config),
Expand Down
3 changes: 1 addition & 2 deletions src/transformer/events/core/course_viewed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ function course_viewed(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course($config, $course),
'context' => [
'language' => $lang,
'extensions' => utils\extensions\base($config, $event, $course),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'category' => [
utils\get_activity\site($config)
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/group_created.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function group_created(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_group($config, $course, $group),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/group_deleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function group_deleted(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_group($config, $course, $group),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/group_member_added.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ function group_member_added(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_group($config, $course, $group),
'context' => [
...utils\get_context_base($config, $event, $lang, $course),
'instructor' => utils\get_user($config, $user),
'extensions' => utils\extensions\base($config, $event, null),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/group_member_removed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ function group_member_removed(array $config, \stdClass $event) {
],
'object' => utils\get_activity\course_group($config, $course, $group),
'context' => [
...utils\get_context_base($config, $event, $lang, $course),
'instructor' => utils\get_user($config, $user),
'extensions' => utils\extensions\base($config, $event, null),
'contextActivities' => [
'parent' => [
utils\get_activity\course($config, $course),
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/events/core/group_message_sent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function group_message_sent(array $config, \stdClass $event) {
],
'object' => utils\get_activity\message($config, $lang, $message),
'context' => [
'extensions' => utils\extensions\base($config, $event, null),
...utils\get_context_base($config, $event, $lang, $course),
'contextActivities' => [
'grouping' => [
utils\get_activity\course_group($config, $course, $group)
Expand Down
Loading

0 comments on commit a7fc6a2

Please sign in to comment.