diff --git a/src/transformer/events/mod_assign/assignment_graded.php b/src/transformer/events/mod_assign/assignment_graded.php
index ae0284e31faeab0839db836356ba6a30e4ff265d..b0b449c18b8b91e0c5be78cabda589e76eefa1b2 100644
--- a/src/transformer/events/mod_assign/assignment_graded.php
+++ b/src/transformer/events/mod_assign/assignment_graded.php
@@ -64,7 +64,7 @@ function assignment_graded(array $config, \stdClass $event) {
$lang => 'attained grade for'
],
],
- 'object' => utils\get_activity\module($config, 'assign', $assignment, $lang),
+ 'object' => utils\get_activity\course_assignment($config, $event->contextinstanceid, $assignment->name, $lang),
'result' => [
'score' => [
'raw' => $scoreraw,
@@ -84,9 +84,6 @@ function assignment_graded(array $config, \stdClass $event) {
utils\INFO_EXTENSION => utils\get_info($config, $event),
],
'contextActivities' => [
- 'other' => [
- utils\get_activity\event_module($config, $event, $lang)
- ],
'grouping' => [
utils\get_activity\site($config),
utils\get_activity\course($config, $course)
diff --git a/src/transformer/events/mod_assign/assignment_submitted.php b/src/transformer/events/mod_assign/assignment_submitted.php
index 1d09c84669eadea222f84221ed8c03ede0b41a12..f404d72b7c8228a8888f762e9f5315946f7cb7fe 100644
--- a/src/transformer/events/mod_assign/assignment_submitted.php
+++ b/src/transformer/events/mod_assign/assignment_submitted.php
@@ -24,6 +24,8 @@ function assignment_submitted(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);
+ $assignmentsubmission = $repo->read_record_by_id('assign_submission', $event->objectid);
+ $assignment = $repo->read_record_by_id('assign', $assignmentsubmission->assignment);
$lang = utils\get_course_lang($course);
return [[
@@ -34,7 +36,7 @@ function assignment_submitted(array $config, \stdClass $event) {
$lang => 'submitted'
],
],
- 'object' => utils\get_activity\event_module($config, $event, $lang),
+ 'object' => utils\get_activity\course_assignment($config, $event->contextinstanceid, $assignment->name, $lang),
'timestamp' => utils\get_event_timestamp($event),
'context' => [
'platform' => $config['source_name'],
diff --git a/src/transformer/utils/get_activity/course_assignment.php b/src/transformer/utils/get_activity/course_assignment.php
new file mode 100644
index 0000000000000000000000000000000000000000..ef5afcbddb16549eb9bfe361b8d849fd5aaff444
--- /dev/null
+++ b/src/transformer/utils/get_activity/course_assignment.php
@@ -0,0 +1,32 @@
+<?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\utils\get_activity;
+defined('MOODLE_INTERNAL') || die();
+
+use src\transformer\utils as utils;
+
+function course_assignment(array $config, $cmid, $name, $lang) {
+ return [
+ 'id' => $config['app_url'].'/mod/assign/view.php?id='.$cmid,
+ 'definition' => [
+ 'type' => 'http://adlnet.gov/expapi/activities/assessment',
+ 'name' => [
+ $lang => $name,
+ ],
+ ],
+ ];
+}
diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded/data.json b/tests/mod_assign/assignment_graded/existing_assignment_graded/data.json
index aec10aa9bc6389acde1bdacced0b0911fd74fd1f..4c285fc09c3f37e8e99bb204aa301fff906b1340 100644
--- a/tests/mod_assign/assignment_graded/existing_assignment_graded/data.json
+++ b/tests/mod_assign/assignment_graded/existing_assignment_graded/data.json
@@ -18,6 +18,14 @@
"lang": "en"
}
],
+ "course_modules": [
+ {
+ "id": 1,
+ "course": 1,
+ "module": 1,
+ "instance": 1
+ }
+ ],
"assign": [
{
"id": 1,
diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded/event.json b/tests/mod_assign/assignment_graded/existing_assignment_graded/event.json
index d1d484166e6807d87c69d2bfaef7a19017be4309..bce74db3d3b3e6301ed5aa831a48b4c695749e9f 100644
--- a/tests/mod_assign/assignment_graded/existing_assignment_graded/event.json
+++ b/tests/mod_assign/assignment_graded/existing_assignment_graded/event.json
@@ -5,5 +5,6 @@
"timecreated": 1433946701,
"objecttable": "grade",
"objectid": 1,
+ "contextinstanceid": 1,
"eventname": "\\mod_assign\\event\\submission_graded"
}
\ No newline at end of file
diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded/statements.json b/tests/mod_assign/assignment_graded/existing_assignment_graded/statements.json
index a1c609f4f4e867f805bd14fd66899a9497129e46..af77aa6830e9fb1958a2932c2dd415a1043e19c3 100644
--- a/tests/mod_assign/assignment_graded/existing_assignment_graded/statements.json
+++ b/tests/mod_assign/assignment_graded/existing_assignment_graded/statements.json
@@ -16,7 +16,7 @@
"object": {
"id": "http:\/\/www.example.org\/mod\/assign\/view.php?id=1",
"definition": {
- "type": "http:\/\/id.tincanapi.com\/activitytype\/lms\/module",
+ "type": "http:\/\/adlnet.gov\/expapi\/activities\/assessment",
"name": {
"en": "test_name"
}
@@ -52,17 +52,6 @@
}
},
"contextActivities": {
- "other": [
- {
- "id": "http:\/\/www.example.org\/mod\/grade\/view.php?id=1",
- "definition": {
- "type": "http:\/\/id.tincanapi.com\/activitytype\/lms\/module",
- "name": {
- "en": "grade"
- }
- }
- }
- ],
"grouping": [
{
"id": "http:\/\/www.example.org",
diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json
index 9972817c46232b5902a642378f622c93643a4687..d64a6e5afde0d51b67ed3cea460b6a7896dc673b 100644
--- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json
+++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json
@@ -13,7 +13,21 @@
"lang": "en"
}
],
- "assignment_submissions": [
+ "course_modules": [
+ {
+ "id": 1,
+ "course": 1,
+ "module": 1,
+ "instance": 1
+ }
+ ],
+ "assign_submission": [
+ {
+ "id": 1,
+ "assignment": 1
+ }
+ ],
+ "assign": [
{
"id": 1,
"name": "test_name"
diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json
index bfcfbb92ebdd819399c022abd12b16efca23e8e7..59ba3551d2fc182a136e1242567460565951dbbb 100644
--- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json
+++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json
@@ -5,5 +5,6 @@
"timecreated": 1433946701,
"objecttable": "assignment_submissions",
"objectid": 1,
+ "contextinstanceid": 1,
"eventname": "\\mod_assign\\event\\assessable_submitted"
}
\ No newline at end of file
diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json
index b07cb6ce4de5737a679764f0159073453da061a2..a3dba30ff127a8821f46a7efdb33ae35ea553d75 100644
--- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json
+++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json
@@ -14,9 +14,9 @@
}
},
"object": {
- "id": "http:\/\/www.example.org\/mod\/assignment_submissions\/view.php?id=1",
+ "id": "http:\/\/www.example.org\/mod\/assign\/view.php?id=1",
"definition": {
- "type": "http:\/\/id.tincanapi.com\/activitytype\/lms\/module",
+ "type": "http:\/\/adlnet.gov\/expapi\/activities\/assessment",
"name": {
"en": "test_name"
}