From 4e644e8d50606d85c6eb0204af9a49b05bb859a5 Mon Sep 17 00:00:00 2001
From: michaelpenne <michaelpenne>
Date: Fri, 7 Oct 2005 20:33:39 +0000
Subject: [PATCH] Reverted grading back to 1.4.X for when custom scoring is
 turned OFF

---
 mod/lesson/view.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 805c6f9ed3b..f6a671996ed 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -1013,27 +1013,14 @@
                     if (!$lesson->custom) {
                         $ncorrect = 0;                        
                         $temp = array();
-                        if ($pagesanswered = get_records_select("lesson_attempts",  "lessonid = $lesson->id AND 
-                                userid = $USER->id AND retry = $ntries order by timeseen")) {
-
-                            foreach ($pagesanswered as $pageanswered) {
-                                if (!array_key_exists($pageanswered->pageid, $temp)) {
-                                    $temp[$pageanswered->pageid] = array($pageanswered->correct, 1);
-                                } else {
-                                    if ($temp[$pageanswered->pageid][1] < $lesson->maxattempts) {
-                                        $n = $temp[$pageanswered->pageid][1] + 1;
-                                        $temp[$pageanswered->pageid] = array($pageanswered->correct, $n);
-                                    }
-                                }
-                            }
-                            foreach ($temp as $value => $key) {
-                                if ($key[0] == 1) {
-                                    $ncorrect += 1;
-                                }
+                        // count the number of distinct correct pages
+                        if ($correctpages = get_records_select("lesson_attempts",  "lessonid = $lesson->id AND
+                                userid = $USER->id AND retry = $ntries AND correct = 1")) {
+                            foreach ($correctpages as $correctpage) {
+                                $temp[$correctpage->pageid] = 1;
                             }
+                            $ncorrect = count($temp);
                         }
-                        $nviewed = count($temp); // this counts number of Questions the user viewed
-
                         echo "<p align=\"center\">".get_string("numberofpagesviewed", "lesson", $nviewed).
                             "</p>\n";
                         if ($lesson->minquestions) {