diff --git a/src/transformer/events/mod_feedback/item_answered/handler.php b/src/transformer/events/mod_feedback/item_answered/handler.php index c28d67967..710bd1e74 100644 --- a/src/transformer/events/mod_feedback/item_answered/handler.php +++ b/src/transformer/events/mod_feedback/item_answered/handler.php @@ -25,6 +25,8 @@ function handler(array $config, \stdClass $event, \stdClass $feedbackvalue) { $feedbackitem = $repo->read_record_by_id('feedback_item', $feedbackvalue->item); switch ($feedbackitem->typ) { + case 'multichoicerated': + return multichoicerated($config, $event, $feedbackvalue, $feedbackitem); case 'multichoice': return multichoice($config, $event, $feedbackvalue, $feedbackitem); case 'numeric': diff --git a/src/transformer/events/mod_feedback/item_answered/multichoicerated.php b/src/transformer/events/mod_feedback/item_answered/multichoicerated.php new file mode 100644 index 000000000..415e50161 --- /dev/null +++ b/src/transformer/events/mod_feedback/item_answered/multichoicerated.php @@ -0,0 +1,87 @@ +. + +namespace src\transformer\events\mod_feedback\item_answered; + +defined('MOODLE_INTERNAL') || die(); + +use src\transformer\utils as utils; + +function multichoicerated(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); + $feedback = $repo->read_record_by_id('feedback', $feedbackitem->feedback); + $lang = utils\get_course_lang($course); + $presentedchoices = explode("|", substr($feedbackitem->presentation, 6)); + $choices = array_map(function ($presentation, $id) { + $split = explode('####', $presentation); + $rating = $split[0]; + $name = $split[1]; + return (object) [ + 'rating' => intval($rating), + 'name' => $name, + 'id' => $id, + ]; + }, $presentedchoices, array_keys($presentedchoices)); + $selectedchoice = $choices[intval($feedbackvalue->value) - 1]; + + return [[ + 'actor' => utils\get_user($config, $user), + 'verb' => [ + 'id' => 'http://adlnet.gov/expapi/verbs/answered', + 'display' => [ + $lang => 'answered' + ], + ], + 'object' => [ + 'id' => $config['app_url'].'/mod/feedback/edit_item.php?id='.$feedbackitem->id, + 'definition' => [ + 'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction', + 'name' => [ + $lang => $feedbackitem->name, + ], + 'interactionType' => 'choice', + ] + ], + 'timestamp' => utils\get_event_timestamp($event), + 'result' => [ + 'response' => $selectedchoice->name, + 'completion' => $feedbackvalue->value !== '', + 'extensions' => [ + 'http://learninglocker.net/xapi/moodle/feedback_item_rating' => $selectedchoice->rating, + 'http://learninglocker.net/xapi/cmi/choice/response' => $selectedchoice->name, + ], + ], + '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), + utils\get_activity\course_feedback($config, $event->contextinstanceid, $feedback, $lang), + ], + 'category' => [ + utils\get_activity\source($config), + ] + ], + ] + ]]; +} \ No newline at end of file diff --git a/tests/mod_feedback/response_submitted/multichoicerated/data.json b/tests/mod_feedback/response_submitted/multichoicerated/data.json new file mode 100644 index 000000000..75c3016ba --- /dev/null +++ b/tests/mod_feedback/response_submitted/multichoicerated/data.json @@ -0,0 +1,45 @@ +{ + "user": [ + { + "id": 1, + "firstname": "test_fullname", + "email": "test@test.com" + } + ], + "course": [ + { + "id": 1, + "fullname": "test_name", + "lang": "en" + } + ], + "feedback_completed": [ + { + "id": 1, + "feedback": 1 + } + ], + "feedback": [ + { + "id": 1, + "name": "test_feedback_name" + } + ], + "feedback_item": [ + { + "id": 1, + "feedback": 1, + "name": "test_feedback_item", + "typ": "multichoicerated", + "presentation": "r>>>>>3####test_choice_1|2####test_choice_2|1####test_choice_3" + } + ], + "feedback_value": [ + { + "id": 1, + "item": 1, + "completed": 1, + "value": "3" + } + ] +} \ No newline at end of file diff --git a/tests/mod_feedback/response_submitted/multichoicerated/event.json b/tests/mod_feedback/response_submitted/multichoicerated/event.json new file mode 100644 index 000000000..5cd948b5e --- /dev/null +++ b/tests/mod_feedback/response_submitted/multichoicerated/event.json @@ -0,0 +1,9 @@ +{ + "id": 1, + "userid": 1, + "courseid": 1, + "timecreated": 1433946701, + "objectid": 1, + "contextinstanceid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted" +} \ No newline at end of file diff --git a/tests/mod_feedback/response_submitted/multichoicerated/statements.json b/tests/mod_feedback/response_submitted/multichoicerated/statements.json new file mode 100644 index 000000000..1532298be --- /dev/null +++ b/tests/mod_feedback/response_submitted/multichoicerated/statements.json @@ -0,0 +1,160 @@ +[ + { + "actor": { + "name": "test_fullname", + "account": { + "homePage": "http:\/\/www.example.org", + "name": "1" + } + }, + "verb": { + "id": "http:\/\/id.tincanapi.com\/verb\/submitted", + "display": { + "en": "submitted" + } + }, + "object": { + "id": "http:\/\/www.example.org\/mod\/feedback\/view.php?id=1", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/survey", + "name": { + "en": "test_feedback_name" + } + } + }, + "timestamp": "2015-06-10T15:31:41+01:00", + "context": { + "platform": "Moodle", + "language": "en", + "extensions": { + "http:\/\/lrs.learninglocker.net\/define\/extensions\/info": { + "http:\/\/moodle.org": "1.0.0", + "https:\/\/github.com\/xAPI-vle\/moodle-logstore_xapi": "0.0.0-development", + "event_name": "\\mod_feedback\\event\\response_submitted", + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" + } + }, + "contextActivities": { + "grouping": [ + { + "id": "http:\/\/www.example.org", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/lms", + "name": { + "en": "test_name" + } + } + }, + { + "id": "http:\/\/www.example.org\/course\/view.php?id=1", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/lms\/course", + "name": { + "en": "test_name" + } + } + } + ], + "category": [ + { + "id": "http:\/\/moodle.org", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/source", + "name": { + "en": "Moodle" + } + } + } + ] + } + } + }, + { + "actor": { + "name": "test_fullname", + "account": { + "homePage": "http:\/\/www.example.org", + "name": "1" + } + }, + "verb": { + "id": "http:\/\/adlnet.gov\/expapi\/verbs\/answered", + "display": { + "en": "answered" + } + }, + "object": { + "id": "http:\/\/www.example.org\/mod\/feedback\/edit_item.php?id=1", + "definition": { + "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction", + "name": { + "en": "test_feedback_item" + }, + "interactionType": "choice" + } + }, + "timestamp": "2015-06-10T15:31:41+01:00", + "result": { + "response": "test_choice_3", + "completion": true, + "extensions": { + "http:\/\/learninglocker.net\/xapi\/moodle\/feedback_item_rating": 1, + "http:\/\/learninglocker.net\/xapi\/cmi\/choice\/response": "test_choice_3" + } + }, + "context": { + "platform": "Moodle", + "language": "en", + "extensions": { + "http:\/\/lrs.learninglocker.net\/define\/extensions\/info": { + "http:\/\/moodle.org": "1.0.0", + "https:\/\/github.com\/xAPI-vle\/moodle-logstore_xapi": "0.0.0-development", + "event_name": "\\mod_feedback\\event\\response_submitted", + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" + } + }, + "contextActivities": { + "grouping": [ + { + "id": "http:\/\/www.example.org", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/lms", + "name": { + "en": "test_name" + } + } + }, + { + "id": "http:\/\/www.example.org\/course\/view.php?id=1", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/lms\/course", + "name": { + "en": "test_name" + } + } + }, + { + "id": "http:\/\/www.example.org\/mod\/feedback\/view.php?id=1", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/survey", + "name": { + "en": "test_feedback_name" + } + } + } + ], + "category": [ + { + "id": "http:\/\/moodle.org", + "definition": { + "type": "http:\/\/id.tincanapi.com\/activitytype\/source", + "name": { + "en": "Moodle" + } + } + } + ] + } + } + } +] \ No newline at end of file diff --git a/tests/mod_feedback/response_submitted/multichoicerated/test.php b/tests/mod_feedback/response_submitted/multichoicerated/test.php new file mode 100644 index 000000000..d61c897d6 --- /dev/null +++ b/tests/mod_feedback/response_submitted/multichoicerated/test.php @@ -0,0 +1,24 @@ +. + +namespace tests\mod_feedback\response_submitted\multichoicerated; +defined('MOODLE_INTERNAL') || die(); + +class test extends \tests\xapi_test_case { + protected function get_test_dir() { + return __DIR__; + } +} \ No newline at end of file