fix: Fixes module URLs and activity types to close #186. (#221)

src/transformer/events/all/course_module_viewed.php

@@ -34,7 +34,12 @@ function course_module_viewed(array $config, \stdClass $event) {
                 $lang => 'viewed'
             ],
         ],
-        'object' => utils\get_activity\event_module($config, $event, $lang),
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'http://id.tincanapi.com/activitytype/lms/module'
+        ),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],

src/transformer/events/core/course_module_completion_updated.php

@@ -37,7 +37,12 @@ function course_module_completion_updated(array $config, \stdClass $event) {
                 $lang => 'completed'
             ],
         ],
-        'object' => utils\get_activity\module($config, $moduletype->name, $module, $lang),
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'http://id.tincanapi.com/activitytype/lms/module'
+        ),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],

src/transformer/events/mod_book/course_module_viewed.php

@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace src\transformer\events\mod_book;
+
+defined('MOODLE_INTERNAL') || die();
+
+use src\transformer\utils as utils;
+
+function course_module_viewed(array $config, \stdClass $event) {
+    $repo = $config['repo'];
+    $user = $repo->read_record_by_id('user', $event->userid);
+    $course = $repo->read_record_by_id('course', $event->courseid);
+    $lang = utils\get_course_lang($course);
+
+    return [[
+        'actor' => utils\get_user($config, $user),
+        'verb' => [
+            'id' => 'http://id.tincanapi.com/verb/viewed',
+            'display' => [
+                $lang => 'viewed'
+            ],
+        ],
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'http://id.tincanapi.com/activitytype/book'
+        ),
+        'timestamp' => utils\get_event_timestamp($event),
+        'context' => [
+            'platform' => $config['source_name'],
+            'language' => $lang,
+            'extensions' => [
+                utils\INFO_EXTENSION => utils\get_info($config, $event),
+            ],
+            'contextActivities' => [
+                'grouping' => [
+                    utils\get_activity\site($config),
+                    utils\get_activity\course($config, $course),
+                ],
+                'category' => [
+                    utils\get_activity\source($config),
+                ]
+            ],
+        ]
+    ]];
+}

src/transformer/events/mod_chat/course_module_viewed.php

@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace src\transformer\events\mod_chat;
+
+defined('MOODLE_INTERNAL') || die();
+
+use src\transformer\utils as utils;
+
+function course_module_viewed(array $config, \stdClass $event) {
+    $repo = $config['repo'];
+    $user = $repo->read_record_by_id('user', $event->userid);
+    $course = $repo->read_record_by_id('course', $event->courseid);
+    $lang = utils\get_course_lang($course);
+
+    return [[
+        'actor' => utils\get_user($config, $user),
+        'verb' => [
+            'id' => 'http://id.tincanapi.com/verb/viewed',
+            'display' => [
+                $lang => 'viewed'
+            ],
+        ],
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'http://id.tincanapi.com/activitytype/chat-channel'
+        ),
+        'timestamp' => utils\get_event_timestamp($event),
+        'context' => [
+            'platform' => $config['source_name'],
+            'language' => $lang,
+            'extensions' => [
+                utils\INFO_EXTENSION => utils\get_info($config, $event),
+            ],
+            'contextActivities' => [
+                'grouping' => [
+                    utils\get_activity\site($config),
+                    utils\get_activity\course($config, $course),
+                ],
+                'category' => [
+                    utils\get_activity\source($config),
+                ]
+            ],
+        ]
+    ]];
+}

src/transformer/events/mod_facetoface/cancel_booking.php

@@ -34,7 +34,12 @@ function cancel_booking(array $config, \stdClass $event) {
                 $lang => 'unregistered from'
             ],
         ],
-        'object' => utils\get_activity\event_module($config, $event, $lang),
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'https://w3id.org/xapi/acrossx/activities/face-to-face-discussion'
+        ),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],

src/transformer/events/mod_facetoface/course_module_viewed.php

@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace src\transformer\events\mod_facetoface;
+
+defined('MOODLE_INTERNAL') || die();
+
+use src\transformer\utils as utils;
+
+function course_module_viewed(array $config, \stdClass $event) {
+    $repo = $config['repo'];
+    $user = $repo->read_record_by_id('user', $event->userid);
+    $course = $repo->read_record_by_id('course', $event->courseid);
+    $lang = utils\get_course_lang($course);
+
+    return [[
+        'actor' => utils\get_user($config, $user),
+        'verb' => [
+            'id' => 'http://id.tincanapi.com/verb/viewed',
+            'display' => [
+                $lang => 'viewed'
+            ],
+        ],
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'https://w3id.org/xapi/acrossx/activities/face-to-face-discussion'
+        ),
+        'timestamp' => utils\get_event_timestamp($event),
+        'context' => [
+            'platform' => $config['source_name'],
+            'language' => $lang,
+            'extensions' => [
+                utils\INFO_EXTENSION => utils\get_info($config, $event),
+            ],
+            'contextActivities' => [
+                'grouping' => [
+                    utils\get_activity\site($config),
+                    utils\get_activity\course($config, $course),
+                ],
+                'category' => [
+                    utils\get_activity\source($config),
+                ]
+            ],
+        ]
+    ]];
+}

src/transformer/events/mod_facetoface/signup_success.php

@@ -34,7 +34,12 @@ function signup_success(array $config, \stdClass $event) {
                 $lang => 'registered to'
             ],
         ],
-        'object' => utils\get_activity\event_module($config, $event, $lang),
+        'object' => utils\get_activity\course_module(
+            $config,
+            $course,
+            $event->contextinstanceid,
+            'https://w3id.org/xapi/acrossx/activities/face-to-face-discussion'
+        ),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],

src/transformer/events/mod_facetoface/take_attendance.php

@@ -46,7 +46,12 @@ function take_attendance(array $config, \stdClass $event) {
                             $lang => 'attended'
                         ],
                     ],
-                    'object' => utils\get_activity\event_module($config, $event, $lang),
+                    'object' => utils\get_activity\course_module(
+                        $config,
+                        $course,
+                        $event->contextinstanceid,
+                        'https://w3id.org/xapi/acrossx/activities/face-to-face-discussion'
+                    ),
                     'timestamp' => utils\get_event_timestamp($event),
                     'result' => [
                         'duration' => "PT".(string) $sessionduration."S",

src/transformer/events/mod_feedback/course_module_viewed.php

@@ -24,7 +24,6 @@ function course_module_viewed(array $config, \stdClass $event) {
     $repo = $config['repo'];
     $user = $repo->read_record_by_id('user', $event->userid);
     $course = $repo->read_record_by_id('course', $event->courseid);
-    $feedback = $repo->read_record_by_id('feedback', $event->objectid);
     $lang = utils\get_course_lang($course);
 
     return [[
@@ -35,7 +34,7 @@ function course_module_viewed(array $config, \stdClass $event) {
                 $lang => 'viewed'
             ],
         ],
-        'object' => utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+        'object' => utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],

src/transformer/events/mod_feedback/item_answered/handler.php

@@ -30,7 +30,7 @@ function handler(array $config, \stdClass $event, \stdClass $feedbackvalue) {
         case 'multichoice':
             return multichoice($config, $event, $feedbackvalue, $feedbackitem);
         case 'numeric':
-            return numeric($config, $event, $feedbackvalue, $feedbackitem);
+            return numerical($config, $event, $feedbackvalue, $feedbackitem);
         case 'textarea':
             return textarea($config, $event, $feedbackvalue, $feedbackitem);
         case 'textfield':

src/transformer/events/mod_feedback/item_answered/multichoice.php

@@ -65,7 +65,7 @@ function multichoice(array $config, \stdClass $event, \stdClass $feedbackvalue,
                 'grouping' => [
                     utils\get_activity\site($config),
                     utils\get_activity\course($config, $course),
-                    utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+                    utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
                 ],
                 'category' => [
                     utils\get_activity\source($config),

src/transformer/events/mod_feedback/item_answered/multichoicerated.php

@@ -76,7 +76,7 @@ function multichoicerated(array $config, \stdClass $event, \stdClass $feedbackva
                 'grouping' => [
                     utils\get_activity\site($config),
                     utils\get_activity\course($config, $course),
-                    utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+                    utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
                 ],
                 'category' => [
                     utils\get_activity\source($config),

src/transformer/events/mod_feedback/item_answered/numeric.php → src/transformer/events/mod_feedback/item_answered/numerical.php

@@ -20,7 +20,7 @@
 
 use src\transformer\utils as utils;
 
-function numeric(array $config, \stdClass $event, \stdClass $feedbackvalue, \stdClass $feedbackitem) {
+function numerical(array $config, \stdClass $event, \stdClass $feedbackvalue, \stdClass $feedbackitem) {
     $repo = $config['repo'];
     $user = $repo->read_record_by_id('user', $event->userid);
     $course = $repo->read_record_by_id('course', $event->courseid);
@@ -63,7 +63,7 @@ function numeric(array $config, \stdClass $event, \stdClass $feedbackvalue, \std
                 'grouping' => [
                     utils\get_activity\site($config),
                     utils\get_activity\course($config, $course),
-                    utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+                    utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
                 ],
                 'category' => [
                     utils\get_activity\source($config),

src/transformer/events/mod_feedback/item_answered/textarea.php

@@ -60,7 +60,7 @@ function textarea(array $config, \stdClass $event, \stdClass $feedbackvalue, \st
                 'grouping' => [
                     utils\get_activity\site($config),
                     utils\get_activity\course($config, $course),
-                    utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+                    utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
                 ],
                 'category' => [
                     utils\get_activity\source($config),

src/transformer/events/mod_feedback/item_answered/textfield.php

@@ -60,7 +60,7 @@ function textfield(array $config, \stdClass $event, \stdClass $feedbackvalue, \s
                 'grouping' => [
                     utils\get_activity\site($config),
                     utils\get_activity\course($config, $course),
-                    utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+                    utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
                 ],
                 'category' => [
                     utils\get_activity\source($config),

src/transformer/events/mod_feedback/response_submitted/response_submitted.php

@@ -36,7 +36,7 @@ function response_submitted(array $config, \stdClass $event) {
                 $lang => 'submitted'
             ],
         ],
-        'object' => utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang),
+        'object' => utils\get_activity\course_feedback($config, $course, $event->contextinstanceid),
         'timestamp' => utils\get_event_timestamp($event),
         'context' => [
             'platform' => $config['source_name'],