Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plugins bot
moodle-plugins-snapshots
Commits
6c6bd6e1
Commit
6c6bd6e1
authored
Jan 24, 2017
by
Ankit Agarwal
Browse files
MDL-57296 gradelib: Fix get_hidding_effect for grade_type_none items
parent
bba75cb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
grade/report/grader/lib.php
View file @
6c6bd6e1
...
...
@@ -565,11 +565,16 @@ class grade_report_grader extends grade_report {
WHERE g.itemid = gi.id AND gi.courseid = :courseid
{
$this
->
userselect
}
"
;
$userids
=
array_keys
(
$this
->
users
);
$allgradeitems
=
$this
->
get_allgradeitems
();
if
(
$grades
=
$DB
->
get_records_sql
(
$sql
,
$params
))
{
foreach
(
$grades
as
$graderec
)
{
$grade
=
new
grade_grade
(
$graderec
,
false
);
$this
->
allgrades
[
$graderec
->
userid
][
$graderec
->
itemid
]
=
$grade
;
if
(
!
empty
(
$allgradeitems
[
$graderec
->
itemid
]))
{
// Note: Filter out grades which have a grade type of GRADE_TYPE_NONE.
// Only grades without this type are present in $allgradeitems.
$this
->
allgrades
[
$graderec
->
userid
][
$graderec
->
itemid
]
=
$grade
;
}
if
(
in_array
(
$graderec
->
userid
,
$userids
)
and
array_key_exists
(
$graderec
->
itemid
,
$this
->
gtree
->
get_items
()))
{
// some items may not be present!!
$this
->
grades
[
$graderec
->
userid
][
$graderec
->
itemid
]
=
$grade
;
$this
->
grades
[
$graderec
->
userid
][
$graderec
->
itemid
]
->
grade_item
=
$this
->
gtree
->
get_item
(
$graderec
->
itemid
);
// db caching
...
...
@@ -592,7 +597,6 @@ class grade_report_grader extends grade_report {
}
// Pre fill grades for any remaining items which might be collapsed.
$allgradeitems
=
$this
->
get_allgradeitems
();
foreach
(
$userids
as
$userid
)
{
foreach
(
$allgradeitems
as
$itemid
=>
$gradeitem
)
{
if
(
!
isset
(
$this
->
allgrades
[
$userid
][
$itemid
]))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment