File tree Expand file tree Collapse file tree 2 files changed +11
-5
lines changed
grade/report/singleview/classes/local/screen Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -369,12 +369,14 @@ public function process($data): \stdClass {
369
369
continue ;
370
370
}
371
371
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
+ }
376
379
377
- $ data ->$ field = empty ($ grade ) ? $ null : $ grade ->finalgrade ;
378
380
$ data ->{"old $ field " } = $ data ->$ field ;
379
381
}
380
382
}
Original file line number Diff line number Diff line change @@ -5423,6 +5423,8 @@ public function get_assign_feedback_status_renderable($user) {
5423
5423
new \grade_grade ([
5424
5424
'deductedmark ' => $ gradebookgrade ->deductedmark ?? 0 ,
5425
5425
'overridden ' => $ gradebookgrade ->overridden ?? 0 ,
5426
+ 'itemid ' => $ this ->get_grade_item ()->id ,
5427
+ 'userid ' => $ user ->id ,
5426
5428
], false )
5427
5429
);
5428
5430
@@ -5655,6 +5657,8 @@ protected function get_all_grades($userid) {
5655
5657
new \grade_grade ([
5656
5658
'deductedmark ' => $ deductedmark ,
5657
5659
'overridden ' => $ userid > 0 ? $ this ->get_grade_item ()->get_grade ($ userid )->overridden : 0 ,
5660
+ 'itemid ' => $ this ->get_grade_item ()->id ,
5661
+ 'userid ' => $ userid ,
5658
5662
], false )
5659
5663
);
5660
5664
$ gradeoutput = $ penaltystatus . format_float ($ penalisedgrade , $ this ->get_grade_item ()->get_decimals ());
You can’t perform that action at this time.
0 commit comments