Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assign submission graded #45

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Assign submission graded #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6307509
fix scoring for submission graded
milt Oct 23, 2024
0641d36
amend assignment graded
milt Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions src/transformer/events/mod_assign/assignment_graded.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ function assignment_graded(array $config, \stdClass $event) {
$assignment = $repo->read_record_by_id('assign', $grade->assignment);
$lang = utils\get_course_lang($course);

$coursemodule = $repo->read_record_by_id('course_modules', $event->contextinstanceid);
$module = $repo->read_record_by_id('modules', $coursemodule->module);
$instance = $repo->read_record_by_id($module->name, $coursemodule->instance);
$instancename = property_exists($instance, 'name') ? $instance->name : $module->name;

$gradecomment = null;
try {
$gradecomment = $repo->read_record('assignfeedback_comments', [
Expand All @@ -62,6 +67,8 @@ function assignment_graded(array $config, \stdClass $event) {
$scoreraw = (float) ($grade->grade ?: 0);
$scoremin = (float) ($gradeitems->grademin ?: 0);
$scoremax = (float) ($gradeitems->grademax ?: 0);
$validscore = ($scoremin <= $scoreraw && $scoreraw <= $scoremax) ? true : false;

$scorepass = (float) ($gradeitems->gradepass ?: null);

$success = false;
Expand All @@ -72,13 +79,26 @@ function assignment_graded(array $config, \stdClass $event) {

$statement = [
'actor' => utils\get_user($config, $user),
'verb' => utils\get_verb('scored', $config, $lang),
'object' => utils\get_activity\course_assignment($config, $event->contextinstanceid, $assignment->name, $lang),
'result' => [
'score' => [
'raw' => $scoreraw
'verb' => [
'id' => 'https://w3id.org/xapi/tla/verbs/scored',
'display' => [
$lang => 'Scored',
],
'completion' => true,
],
'object' => [
'id' => $config['app_url']
. '/mod/assign/view.php?id='
. $event->contextinstanceid
. '#submission',
'objectType' => 'Activity',
'definition' => [
'type' => 'https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission',
'name' => [
$lang => $instancename . ' Submission'
]
]
],
'result' => [
'success' => $success
],
'context' => [
Expand All @@ -88,7 +108,8 @@ function assignment_graded(array $config, \stdClass $event) {
'contextActivities' => [
'parent' => utils\context_activities\get_parent(
$config,
$event->contextinstanceid
$event->contextinstanceid,
true
),
'category' => [
utils\get_activity\site($config),
Expand All @@ -101,17 +122,14 @@ function assignment_graded(array $config, \stdClass $event) {
$statement['result']['response'] = $gradecomment;
}

// Only include min score if raw score is valid for that min.
if ($scoreraw >= $scoremin) {
$statement['result']['score']['min'] = $scoremin;
}
// Only include max score if raw score is valid for that max.
if ($scoreraw <= $scoremax) {
$statement['result']['score']['max'] = $scoremax;
}
// Calculate scaled score as the distance from zero towards the max (or min for negative scores).
if ($scoreraw >= 0) {
$statement['result']['score']['scaled'] = $scoreraw / $scoremax;
// only write a score if valid
if ($validscore) {
$statement['result']['score'] = [
'raw' => $scoreraw,
'min' => $scoremin,
'max' => $scoremax,
'scaled' => utils\get_scaled_score($scoreraw, $scoremin, $scoremax),
];
}

return [$statement];
Expand Down
6 changes: 6 additions & 0 deletions tests/mod_assign/assignment_graded/existing_assignment_graded_comment/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,11 @@
"grademax": 2,
"gradepass": 1
}
],
"modules": [
{
"id": 1,
"name": "assign"
}
]
}
29 changes: 19 additions & 10 deletions tests/mod_assign/assignment_graded/existing_assignment_graded_comment/statements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@
}
},
"verb": {
"id": "http://adlnet.gov/expapi/verbs/scored",
"id": "https://w3id.org/xapi/tla/verbs/scored",
"display": {
"en": "attained grade for"
"en": "Scored"
}
},
"object": {
"id": "http://www.example.org/mod/assign/view.php?id=1",
"id": "http://www.example.org/mod/assign/view.php?id=1#submission",
"objectType": "Activity",
"definition": {
"type": "http://adlnet.gov/expapi/activities/assessment",
"type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission",
"name": {
"en": "test_name"
"en": "test_name Submission"
}
}
},
"result": {
"score": {
"raw": 1,
"min": 0,
"max": 2,
"scaled": 0.5
"raw": 1.0,
"min": 0.0,
"max": 2.0,
"scaled": 0.0
},
"completion": true,
"success": true,
"response": "test_comment_text"
},
Expand All @@ -52,6 +52,15 @@
},
"contextActivities": {
"parent": [
{
"id": "http://www.example.org/mod/assign/view.php?id=1",
"definition": {
"type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment",
"name": {
"en": "test_name"
}
}
},
{
"id": "http://www.example.org/course/section.php?id=1",
"objectType": "Activity",
Expand Down
6 changes: 6 additions & 0 deletions tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,11 @@
"grademax": 2,
"gradepass": 1
}
],
"modules": [
{
"id": 1,
"name": "assign"
}
]
}
29 changes: 19 additions & 10 deletions tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/statements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@
}
},
"verb": {
"id": "http://adlnet.gov/expapi/verbs/scored",
"id": "https://w3id.org/xapi/tla/verbs/scored",
"display": {
"en": "attained grade for"
"en": "Scored"
}
},
"object": {
"id": "http://www.example.org/mod/assign/view.php?id=1",
"id": "http://www.example.org/mod/assign/view.php?id=1#submission",
"objectType": "Activity",
"definition": {
"type": "http://adlnet.gov/expapi/activities/assessment",
"type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission",
"name": {
"en": "test_name"
"en": "test_name Submission"
}
}
},
"result": {
"score": {
"raw": 1,
"min": 0,
"max": 2,
"scaled": 0.5
"raw": 1.0,
"min": 0.0,
"max": 2.0,
"scaled": 0.0
},
"completion": true,
"success": true
},
"context": {
Expand All @@ -51,6 +51,15 @@
},
"contextActivities": {
"parent": [
{
"id": "http://www.example.org/mod/assign/view.php?id=1",
"definition": {
"type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment",
"name": {
"en": "test_name"
}
}
},
{
"id": "http://www.example.org/course/section.php?id=1",
"objectType": "Activity",
Expand Down
Loading