From: kaipe <kaipe>
Date: Sun, 3 Aug 2003 21:39:32 +0000 (+0000)
Subject: Resolving bug #576.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5a24a01868d9e263c592579085b7eaeb2aa77e50;p=moodle.git

Resolving bug #576.
This solution shows the message "Recently added question!" and the question text for each question that has been added since the reviewed attempt.
The advantage with the chosen solution is that it will work fine for the (soon to come) "Each attempt builds on the last" quiz option.

As I don't have the karma needed for updating in lang/en/, the message does not yet look quite as I described it above.
---

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 99f197f72e..51481c45bb 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -468,7 +468,8 @@ function quiz_print_question($number, $question, $grade, $courseid,
     $stranswer = get_string("answer", "quiz");
     $strmarks  = get_string("marks", "quiz");
 
-    echo "<table width=100% cellspacing=10><tr><td nowrap width=100 valign=top>";
+    echo "<table width=100% cellspacing=10>";
+    echo "<tr><td nowrap width=100 valign=top>";
     echo "<p align=center><b>$number</b></p>";
     if ($feedback or $response) {
         echo "<p align=center><font size=1>$strmarks: $actualgrade/$grade</font></p>";
@@ -476,7 +477,19 @@ function quiz_print_question($number, $question, $grade, $courseid,
         echo "<p align=center><font size=1>$grade $strmarks</font></p>";
     }
     print_spacer(1,100);
-    echo "</td><td valign=top>";
+    
+    if ($question->recentlyadded) {
+        echo "</td><td valign=top align=right>";
+        // Notify the user of this recently added question
+        echo '<font color="red">';
+        echo get_string('recentlyaddedquestion', 'quiz');
+        echo '</font>';
+        echo '</td></tr><tr><td></td><td valign=top>';
+
+    } else { // The normal case
+        echo "</td><td valign=top>";
+    }
+
 
     if (empty($realquestion)) { 
         $realquestion->id = $question->id;
@@ -829,7 +842,9 @@ function quiz_print_question($number, $question, $grade, $courseid,
             break;
 
        case RANDOM:
-           echo "<P>Random questions should not be printed this way!</P>";
+           // This can only happen if it is a recently added question
+
+           echo '<P>' . get_string('random', 'quiz') . '</P>';
            break;
 
        default: 
@@ -869,8 +884,16 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuff
     if ($shuffleorder) {                             // Order has been defined, so reorder questions
         $oldquestions = $questions;
         $questions = array();
-        foreach ($shuffleorder as $key) {     
-            $questions[] = $oldquestions[$key];      // This loses the index key, but doesn't matter
+        foreach ($shuffleorder as $key) {
+            if (empty($oldquestions[$key])) { // Check for recently added questions
+                if ($recentlyaddedquestion =
+                        get_record("quiz_questions", "id", $key)) {
+                    $recentlyaddedquestion->recentlyadded = true;
+                    $questions[] = $recentlyaddedquestion;
+                }
+            } else {
+                $questions[] = $oldquestions[$key];      // This loses the index key, but doesn't matter
+            }
         }
     }