Skip to content

Commit 8033c02

Browse files
committed
MDL-84981 core_grades: Resolve Behat failures
1 parent f880bf7 commit 8033c02

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

grade/report/singleview/classes/local/screen/grade.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,14 @@ public function process($data): \stdClass {
369369
continue;
370370
}
371371

372-
$grade = grade_grade::fetch([
373-
'itemid' => $gradeitem->id,
374-
'userid' => $itemid
375-
]);
372+
$grade = $gradeitem->get_grade($itemid, false);
373+
374+
if (empty($grade) || is_null($grade->rawgrade) || is_null($grade->finalgrade)) {
375+
$data->$field = $null;
376+
} else {
377+
$data->$field = $grade->finalgrade;
378+
}
376379

377-
$data->$field = empty($grade) ? $null : $grade->finalgrade;
378380
$data->{"old$field"} = $data->$field;
379381
}
380382
}

mod/assign/locallib.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5423,6 +5423,8 @@ public function get_assign_feedback_status_renderable($user) {
54235423
new \grade_grade([
54245424
'deductedmark' => $gradebookgrade->deductedmark ?? 0,
54255425
'overridden' => $gradebookgrade->overridden ?? 0,
5426+
'itemid' => $this->get_grade_item()->id,
5427+
'userid' => $user->id,
54265428
], false)
54275429
);
54285430

@@ -5655,6 +5657,8 @@ protected function get_all_grades($userid) {
56555657
new \grade_grade([
56565658
'deductedmark' => $deductedmark,
56575659
'overridden' => $userid > 0 ? $this->get_grade_item()->get_grade($userid)->overridden : 0,
5660+
'itemid' => $this->get_grade_item()->id,
5661+
'userid' => $userid,
56585662
], false)
56595663
);
56605664
$gradeoutput = $penaltystatus . format_float($penalisedgrade, $this->get_grade_item()->get_decimals());

0 commit comments

Comments
 (0)