From 29fb5974e7ea1c4401ec1e4f80496183db1426b2 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sat, 10 Jan 2004 07:39:19 +0000
Subject: [PATCH] Increased QUIZ_MAX_NUMBER_ANSWERS to 10, and actually made it
 apply to everythin

---
 mod/quiz/lib.php          |   2 +-
 mod/quiz/multichoice.html | 115 ++++----------------------------------
 mod/quiz/shortanswer.html |  92 ++++--------------------------
 3 files changed, 21 insertions(+), 188 deletions(-)

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 94b9435be9..08b915e5b2 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -38,7 +38,7 @@ $QUIZ_QUESTION_TYPE = array ( MULTICHOICE   => get_string("multichoice", "quiz")
 define("QUIZ_PICTURE_MAX_HEIGHT", "600");   // Not currently implemented
 define("QUIZ_PICTURE_MAX_WIDTH",  "600");   // Not currently implemented
 
-define("QUIZ_MAX_NUMBER_ANSWERS", "8");
+define("QUIZ_MAX_NUMBER_ANSWERS", "10");
 
 /// FUNCTIONS ///////////////////////////////////////////////////////////////////
 
diff --git a/mod/quiz/multichoice.html b/mod/quiz/multichoice.html
index 6886f7d6f1..a865a1454f 100644
--- a/mod/quiz/multichoice.html
+++ b/mod/quiz/multichoice.html
@@ -59,105 +59,23 @@
     </TD>
 </TR>
 
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 1:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[0]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[0]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[0]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 2:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[1]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[1]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[1]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 3:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[2]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[2]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[2]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 4:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[3]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[3]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[3]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
+<?PHP 
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+?>
 <TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 5:</B></P></TD>
+    <TD align=right><P><B><?php  echo get_string("choice", "quiz")." $i";  ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[4]->answer) ?>">&nbsp;&nbsp;
+        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;
         <?php  print_string("grade");
            echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[4]->fraction, ""); ?>
+           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[$i-1]->fraction, ""); ?>
         <BR>
     </TD>
 </TR>
 <TR valign=top>
     <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
     <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[4]->feedback) ?></textarea>
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
     </TD>
 </TR>
 
@@ -165,22 +83,9 @@
     <TD colspan=2>&nbsp;</TD>
 </TR>
 
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 6:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[5]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[5]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[5]->feedback) ?></textarea>
-    </TD>
-</TR>
+<?php
+    } /// End of loop, printing answers
+?>
 </TABLE>
 
 <INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
diff --git a/mod/quiz/shortanswer.html b/mod/quiz/shortanswer.html
index 1b60777923..867f198474 100644
--- a/mod/quiz/shortanswer.html
+++ b/mod/quiz/shortanswer.html
@@ -59,83 +59,24 @@
     </TD>
 
 
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 1:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[0]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[0]->fraction,""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[0]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 2:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[1]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[1]->fraction,""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[1]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 3:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[2]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[2]->fraction,""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[2]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
+<?PHP 
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+?>
 
 <TR valign=top>
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 4:</B></P></TD>
+    <TD align=right><P><B><?php  echo get_string("answer", "quiz")." $i";  ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[3]->answer) ?>">&nbsp;&nbsp;
+        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;
         <?php  print_string("grade");
            echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[3]->fraction,""); ?>
+           choose_from_menu($gradeoptions, "fraction[]", $answers[$i-1]->fraction,""); ?>
         <BR>
     </TD>
 </TR>
 <TR valign=top>
     <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
     <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[3]->feedback) ?></textarea>
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
     </TD>
 </TR>
 
@@ -143,22 +84,9 @@
     <TD colspan=2>&nbsp;</TD>
 </TR>
 
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 5:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[4]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[4]->fraction,""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[4]->feedback) ?></textarea>
-    </TD>
-</TR>
+<?PHP
+    }
+?>
 
 </TABLE>
 
-- 
2.39.5