From 32bb764891de2cabde848fbff07e6ea2431d004b Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Mon, 2 Jul 2012 15:43:32 +0800 Subject: [PATCH] MDL-33030 Lesson module: fixed progress bar --- mod/lesson/renderer.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mod/lesson/renderer.php b/mod/lesson/renderer.php index fc1c99e42c2..765b7ca6e07 100644 --- a/mod/lesson/renderer.php +++ b/mod/lesson/renderer.php @@ -510,15 +510,20 @@ class mod_lesson_renderer extends plugin_renderer_base { $ntries = 0; // may not be necessary } - $viewedpageids = array(); - if ($attempts = $lesson->get_attempts($ntries, true)) { - $viewedpageids = array_merge($viewedpageids, array_keys($attempts)); + if ($attempts = $lesson->get_attempts($ntries, false)) { + foreach($attempts as $attempt) { + $viewedpageids[$attempt->pageid] = $attempt; + } } + $viewedbranches = array(); // collect all of the branch tables viewed - if ($viewedbranches = $DB->get_records("lesson_branch", array ("lessonid"=>$lesson->id, "userid"=>$USER->id, "retry"=>$ntries), 'timeseen DESC', 'id, pageid')) { - $viewedpageids = array_merge($viewedpageids, array_keys($viewedbranches)); + if ($branches = $DB->get_records("lesson_branch", array ("lessonid"=>$lesson->id, "userid"=>$USER->id, "retry"=>$ntries), 'timeseen ASC', 'id, pageid')) { + foreach($branches as $branch) { + $viewedbranches[$branch->pageid] = $branch; + } + $viewedpageids = array_merge($viewedpageids, $viewedbranches); } // Filter out the following pages: