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

…owspans() to deal with activity conditional availability
moodle · Sep 28, 2012 · 60b6b62 · 60b6b62
1 parent bac15e5
commit 60b6b62
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
@@ -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;