Permalink
Browse files

MDL-33117 grade: added some smarts to the user report method inject_r…

…owspans() to deal with activity conditional availability
  • Loading branch information...
1 parent bac15e5 commit 60b6b6280b8d9b3f7fdab93dc9dde9a2ca4a24e5 @andyjdavis andyjdavis committed Aug 14, 2012
Showing with 20 additions and 0 deletions.
  1. +20 −0 grade/report/user/lib.php
View
@@ -228,6 +228,26 @@ function inject_rowspans(&$element) {
}
$count = 1;
foreach ($element['children'] as $key=>$child) {
+
+ $grade_object = $child['object'];
+ // If grade object isn't hidden
+ if ($grade_object->hidden != 1) {
+
+ // If grade object is an module instance
+ if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) {
+
+ $instances = $this->gtree->modinfo->get_instances();
+ // If we can find the module instance
+ if (!empty($instances[$grade_object->itemmodule][$grade_object->iteminstance])) {
+
+ $cm = $instances[$grade_object->itemmodule][$grade_object->iteminstance];
+ // Skip generating rowspans if the user cannot see the module instance
+ if (!$cm->uservisible) {
+ continue;
+ }
+ }
+ }
+ }
$count += $this->inject_rowspans($element['children'][$key]);
}
$element['rowspan'] = $count;

0 comments on commit 60b6b62

Please sign in to comment.