Skip to content

Commit f7bdd5e

Browse files
BrendanHalleyryasmi
BrendanHalley
authored and
ryasmi
committed
fix(Quiz Attempt Submitted): Replace raw score with raw grade. (#489 - Thanks @BrendanHalley)
1 parent 2ca21a0 commit f7bdd5e

File tree

16 files changed

+106
-4
lines changed

16 files changed

+106
-4
lines changed

‎src/transformer/events/mod_quiz/attempt_submitted/attempt_submitted.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ function attempt_submitted(array $config, \stdClass $event) {
3131
'itemmodule' => 'quiz',
3232
'iteminstance' => $quiz->id,
3333
]);
34+
$attemptgrade = $repo->read_record('grade_grades', [
35+
'itemid' => $gradeitem->id,
36+
'userid' => $event->relateduserid
37+
]);
3438
$lang = utils\get_course_lang($course);
3539

3640
return [[
@@ -43,7 +47,7 @@ function attempt_submitted(array $config, \stdClass $event) {
4347
],
4448
'object' => utils\get_activity\course_quiz($config, $course, $event->contextinstanceid),
4549
'timestamp' => utils\get_event_timestamp($event),
46-
'result' => utils\get_attempt_result($config, $attempt, $gradeitem),
50+
'result' => utils\get_attempt_result($config, $attempt, $gradeitem, $attemptgrade),
4751
'context' => [
4852
'platform' => $config['source_name'],
4953
'language' => $lang,

‎src/transformer/utils/get_attempt_result.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
namespace src\transformer\utils;
1818
defined('MOODLE_INTERNAL') || die();
1919

20-
function get_attempt_result(array $config, $attempt, $gradeitem) {
21-
$gradesum = floatval(isset($attempt->sumgrades) ? $attempt->sumgrades : 0);
20+
function get_attempt_result(array $config, $attempt, $gradeitem, $attemptgrade) {
21+
$gradesum = floatval(isset($attemptgrade->rawgrade) ? $attemptgrade->rawgrade : 0);
2222

2323
$minscore = floatval($gradeitem->grademin ?: 0);
2424
$maxscore = floatval($gradeitem->grademax ?: 0);

‎tests/mod_quiz/attempt_submitted/essay/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,12 @@
7474
"qtype": "essay",
7575
"questiontext": "test_question"
7676
}
77+
],
78+
"grade_grades": [
79+
{
80+
"itemid": 1,
81+
"userid": 1,
82+
"rawgrade": 50
83+
}
7784
]
7885
}

‎tests/mod_quiz/attempt_submitted/essay_null_response/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,12 @@
7474
"qtype": "essay",
7575
"questiontext": "test_question"
7676
}
77+
],
78+
"grade_grades": [
79+
{
80+
"itemid": 1,
81+
"userid": 1,
82+
"rawgrade": 50
83+
}
7784
]
7885
}

‎tests/mod_quiz/attempt_submitted/gapselect/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
"qtype": "gapselect",
7676
"questiontext": "<p>Example [[1]] missing [[2]] words [[3]]</p>"
7777
}
78+
],
79+
"grade_grades": [
80+
{
81+
"itemid": 1,
82+
"userid": 1,
83+
"rawgrade": 50
84+
}
7885
]
7986
}

‎tests/mod_quiz/attempt_submitted/match/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
"qtype": "match",
7676
"questiontext": "test_question"
7777
}
78+
],
79+
"grade_grades": [
80+
{
81+
"itemid": 1,
82+
"userid": 1,
83+
"rawgrade": 50
84+
}
7885
]
7986
}

‎tests/mod_quiz/attempt_submitted/multichoice/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,12 @@
9595
"answer": "answer 3",
9696
"question": 1
9797
}
98+
],
99+
"grade_grades": [
100+
{
101+
"itemid": 1,
102+
"userid": 1,
103+
"rawgrade": 50
104+
}
98105
]
99106
}

‎tests/mod_quiz/attempt_submitted/multichoice_withchoices/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,12 @@
8383
"answer": "answer 1",
8484
"question": 1
8585
}
86+
],
87+
"grade_grades": [
88+
{
89+
"itemid": 1,
90+
"userid": 1,
91+
"rawgrade": 50
92+
}
8693
]
8794
}

‎tests/mod_quiz/attempt_submitted/multichoiceset/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,12 @@
9595
"answer": "answer 3",
9696
"question": 1
9797
}
98+
],
99+
"grade_grades": [
100+
{
101+
"itemid": 1,
102+
"userid": 1,
103+
"rawgrade": 50
104+
}
98105
]
99106
}

‎tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,12 @@
9595
"answer": "answer 3",
9696
"question": 1
9797
}
98+
],
99+
"grade_grades": [
100+
{
101+
"itemid": 1,
102+
"userid": 1,
103+
"rawgrade": 50
104+
}
98105
]
99106
}

‎tests/mod_quiz/attempt_submitted/no_questions/data.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,12 @@
6161
}
6262
],
6363
"question_attempts": [],
64-
"question": []
64+
"question": [],
65+
"grade_grades": [
66+
{
67+
"itemid": 1,
68+
"userid": 1,
69+
"rawgrade": 50
70+
}
71+
]
6572
}

‎tests/mod_quiz/attempt_submitted/numerical/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
"qtype": "numerical",
7676
"questiontext": "test_question"
7777
}
78+
],
79+
"grade_grades": [
80+
{
81+
"itemid": 1,
82+
"userid": 1,
83+
"rawgrade": 50
84+
}
7885
]
7986
}

‎tests/mod_quiz/attempt_submitted/randomsamatch/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
"qtype": "randomsamatch",
7676
"questiontext": "<p>Example Random short-answer matching question<br></p>"
7777
}
78+
],
79+
"grade_grades": [
80+
{
81+
"itemid": 1,
82+
"userid": 1,
83+
"rawgrade": 50
84+
}
7885
]
7986
}

‎tests/mod_quiz/attempt_submitted/shortanswer/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,12 @@
7474
"qtype": "shortanswer",
7575
"questiontext": "test_question"
7676
}
77+
],
78+
"grade_grades": [
79+
{
80+
"itemid": 1,
81+
"userid": 1,
82+
"rawgrade": 50
83+
}
7784
]
7885
}

‎tests/mod_quiz/attempt_submitted/truefalse/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
"qtype": "truefalse",
7676
"questiontext": "test_question"
7777
}
78+
],
79+
"grade_grades": [
80+
{
81+
"itemid": 1,
82+
"userid": 1,
83+
"rawgrade": 50
84+
}
7885
]
7986
}

‎tests/mod_quiz/attempt_submitted/unknown_qtype/data.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,12 @@
7474
"qtype": "unknown",
7575
"questiontext": "test_question"
7676
}
77+
],
78+
"grade_grades": [
79+
{
80+
"itemid": 1,
81+
"userid": 1,
82+
"rawgrade": 50
83+
}
7784
]
7885
}

0 commit comments

Comments
 (0)