From c494ec7a161c25523c1db0627f3578f4a92bedf8 Mon Sep 17 00:00:00 2001
From: Michael de Raadt <michaeld@moodle.com>
Date: Thu, 18 Aug 2016 14:24:41 +1000
Subject: [PATCH] CONTRIB-6505 block_completion_progress: Show only activities
 visible to relevant student on Overview

---
 lib.php    | 4 ++--
 styles.css | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib.php b/lib.php
index 4bb4aa6..6ca84a8 100644
--- a/lib.php
+++ b/lib.php
@@ -256,7 +256,7 @@ function block_completion_progress_compare_times($a, $b) {
  * @return array The array with restricted activities removed
  */
 function block_completion_progress_filter_visibility($activities, $userid, $courseid) {
-    global $CFG, $USER;
+    global $CFG;
     $filteredactivities = array();
     $modinfo = get_fast_modinfo($courseid, $userid);
     $coursecontext = CONTEXT_COURSE::instance($courseid);
@@ -273,7 +273,7 @@ function block_completion_progress_filter_visibility($activities, $userid, $cour
 
         // Check availability, allowing for visible, but not accessible items.
         if (!empty($CFG->enableavailability)) {
-            if (has_capability('moodle/course:viewhiddenactivities', $coursecontext, $USER->id)) {
+            if (has_capability('moodle/course:viewhiddenactivities', $coursecontext, $userid)) {
                 $activity['available'] = true;
             } else {
                 if (isset($coursemodule->available) && !$coursemodule->available && empty($coursemodule->availableinfo)) {
diff --git a/styles.css b/styles.css
index 2cbb4f0..dee73f4 100644
--- a/styles.css
+++ b/styles.css
@@ -47,6 +47,10 @@
     position: relative;
 }
 
+#page-blocks-completion_progress-overview .block_completion_progress .progressBarCell {
+    position: inherit;
+}
+
 .block_completion_progress .progressBarCell .nowDiv {
     position: absolute;
     top: -25px;