Increased QUIZ_MAX_NUMBER_ANSWERS to 10, and actually made it apply to everythin

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 94b9435be923277cdcd0c0c0543e112f7cfbd7ac..08b915e5b26838135e8a03d1c14bb87cb47a65a6 100644 (file)
--- 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 6886f7d6f1b234ad721190a65070203f84248910..a865a1454f163c6cd18aa2cffa63731fb97f2033 100644 (file)
--- a/mod/quiz/multichoice.html
+++ b/mod/quiz/multichoice.html
@@ -59,105 +59,23 @@
     </TD>\r
 </TR>\r
 \r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 1:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[0]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[0]->fraction, ""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[0]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 2:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[1]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[1]->fraction, ""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[1]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 3:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[2]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[2]->fraction, ""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[2]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 4:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[3]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[3]->fraction, ""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[3]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
+<?PHP \r
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {\r
+?>\r
 <TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 5:</B></P></TD>\r
+    <TD align=right><P><B><?php  echo get_string("choice", "quiz")." $i";  ?>:</B></P></TD>\r
     <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[4]->answer) ?>">&nbsp;&nbsp;\r
+        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;\r
         <?php  print_string("grade");\r
            echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[4]->fraction, ""); ?>\r
+           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[$i-1]->fraction, ""); ?>\r
         <BR>\r
     </TD>\r
 </TR>\r
 <TR valign=top>\r
     <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
     <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[4]->feedback) ?></textarea>\r
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>\r
     </TD>\r
 </TR>\r
 \r
@@ -165,22 +83,9 @@
     <TD colspan=2>&nbsp;</TD>\r
 </TR>\r
 \r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("choice", "quiz") ?> 6:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[5]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[5]->fraction, ""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[5]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
+<?php\r
+    } /// End of loop, printing answers\r
+?>\r
 </TABLE>\r
 \r
 <INPUT type="hidden" name=id value="<?php  p($question->id) ?>">\r

diff --git a/mod/quiz/shortanswer.html b/mod/quiz/shortanswer.html
index 1b6077792349a460af8d84f7c9f6954ad140ec5b..867f198474135c3faddc977cb62ed5b682e23d5f 100644 (file)
--- a/mod/quiz/shortanswer.html
+++ b/mod/quiz/shortanswer.html
@@ -59,83 +59,24 @@
     </TD>\r
 \r
 \r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 1:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[0]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptions, "fraction[]", $answers[0]->fraction,""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[0]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 2:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[1]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptions, "fraction[]", $answers[1]->fraction,""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[1]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 3:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[2]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptions, "fraction[]", $answers[2]->fraction,""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[2]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
-\r
-<TR valign=top>\r
-    <TD colspan=2>&nbsp;</TD>\r
-</TR>\r
+<?PHP \r
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {\r
+?>\r
 \r
 <TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 4:</B></P></TD>\r
+    <TD align=right><P><B><?php  echo get_string("answer", "quiz")." $i";  ?>:</B></P></TD>\r
     <TD>\r
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[3]->answer) ?>">&nbsp;&nbsp;\r
+        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;\r
         <?php  print_string("grade");\r
            echo ":&nbsp;";\r
-           choose_from_menu($gradeoptions, "fraction[]", $answers[3]->fraction,""); ?>\r
+           choose_from_menu($gradeoptions, "fraction[]", $answers[$i-1]->fraction,""); ?>\r
         <BR>\r
     </TD>\r
 </TR>\r
 <TR valign=top>\r
     <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
     <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[3]->feedback) ?></textarea>\r
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>\r
     </TD>\r
 </TR>\r
 \r
@@ -143,22 +84,9 @@
     <TD colspan=2>&nbsp;</TD>\r
 </TR>\r
 \r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("answer", "quiz") ?> 5:</B></P></TD>\r
-    <TD>\r
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[4]->answer) ?>">&nbsp;&nbsp;\r
-        <?php  print_string("grade");\r
-           echo ":&nbsp;";\r
-           choose_from_menu($gradeoptions, "fraction[]", $answers[4]->fraction,""); ?>\r
-        <BR>\r
-    </TD>\r
-</TR>\r
-<TR valign=top>\r
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>\r
-    <TD>\r
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[4]->feedback) ?></textarea>\r
-    </TD>\r
-</TR>\r
+<?PHP\r
+    }\r
+?>\r
 \r
 </TABLE>\r
 \r