Forms now done, more or less

diff --git a/mod/quiz/multichoice.html b/mod/quiz/multichoice.html
index 0f0f0fa4a9bd338becfb70af70404a0a150f690c..21dc044348bc227e3f72ae2aeb9d8091c9d859d6 100644 (file)
--- a/mod/quiz/multichoice.html
+++ b/mod/quiz/multichoice.html
@@ -1,6 +1,12 @@
 <FORM name="theform" method="post" action="question.php">\r
 <CENTER>\r
 <TABLE cellpadding=5>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("category", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+    <?  choose_from_menu($categories, "category", "$question->category", ""); ?>\r
+    </TD>\r
+</TR>\r
 <TR valign=top>\r
     <TD align=right><P><B><? print_string("questionname", "quiz") ?>:</B></P></TD>\r
     <TD>\r
@@ -15,15 +21,13 @@
     </TD>\r
 </TR>\r
 <TR valign=top>\r
-    <TD align=right><P><B><? print_string("category", "quiz") ?>:</B></P></TD>\r
+    <TD align=right><P><B><? print_string("imageaddress", "quiz") ?>:</B></P></TD>\r
     <TD>\r
-    <?\r
-        choose_from_menu($categories, "category", "$question->category", "");\r
-     ?>\r
+        <INPUT type="text" name="image" size=80 value="<? p($question->image) ?>">\r
     </TD>\r
 </TR>\r
 <TR valign=top>\r
-    <TD align=right><P><B><? print_string("attemptsallowed", "quiz") ?>:</B></P></TD>\r
+    <TD align=right><P><B><? print_string("answerhowmany", "quiz") ?>:</B></P></TD>\r
     <TD>\r
     <?\r
         $options[0] = get_string("answersingleno", "quiz");\r
@@ -32,15 +36,141 @@
      ?>\r
     </TD>\r
 </TR>\r
+\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("choices", "quiz") ?></B>:</P></TD>\r
+    <TD><P><? print_string("fillouttwochoices", "quiz") ?></P>\r
+    </TD>\r
+</TR>\r
+\r
+\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("choice", "quiz") ?> 1:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[0]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? 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><? print_string("choice", "quiz") ?> 2:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[1]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? 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><? print_string("choice", "quiz") ?> 3:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[2]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? 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><? print_string("choice", "quiz") ?> 4:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[3]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\r
+           echo ":&nbsp;";\r
+           choose_from_menu($gradeoptions, "fraction[]", "$answers[3]->fraction", ""); ?>\r
+        <BR>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? p($answers[3]->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><? print_string("choice", "quiz") ?> 5:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[4]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? p($answers[4]->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><? print_string("choice", "quiz") ?> 6:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[5]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\r
+           echo ":&nbsp;";\r
+           choose_from_menu($gradeoptions, "fraction[]", "$answers[5]->fraction", ""); ?>\r
+        <BR>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? p($answers[5]->feedback) ?></textarea>\r
+    </TD>\r
+</TR>\r
 </TABLE>\r
+\r
 <INPUT type="hidden" name=id value="<? p($question->id) ?>">\r
 <INPUT type="hidden" name=type value="<? p($question->type) ?>">\r
 <INPUT type="hidden" name=category value="<? p($question->category) ?>">\r
 <INPUT type="submit" value="<? print_string("savechanges") ?>">\r
 \r
-\r
-\r
-answers go here ...\r
-\r
 </CENTER>\r
 </FORM>\r

diff --git a/mod/quiz/question.php b/mod/quiz/question.php
index 76eb5cd1ba59b9b0e16ac4d1c7ca498a8762a438..92ca6dc19f2eaf8d7acfbe6c7a45bfb2f952f386 100644 (file)
--- a/mod/quiz/question.php
+++ b/mod/quiz/question.php
@@ -68,14 +68,18 @@
 
     if (match_referer() and isset($HTTP_POST_VARS)) {    // question submitted
 
+        redirect("edit.php");
+
     } 
 
     $grades = array(100,90,80,75,70,66.66,60,50,40,33.33,30,25,20,10,5);
     foreach ($grades as $grade) {
-        $gradeoptions[$grade] = $grade;
-        $gradeoptions[-$grade] = -$grade;
+        $gradeoptions[$grade] = "$grade %";
+        $gradeoptionsfull[$grade] = "$grade %";
+        $gradeoptionsfull[-$grade] = -$grade." %";
     }
     arsort($gradeoptions, SORT_NUMERIC);
+    arsort($gradeoptionsfull, SORT_NUMERIC);
 
     if (!$categories = get_records_sql_menu("SELECT id,name FROM quiz_categories 
                                              WHERE course='$course->id' OR publish = '1'
@@ -88,8 +92,13 @@
     switch ($type) {
         case SHORTANSWER:
             $options = get_record("quiz_shortanswer", "question", "$question->id");// OK to fail
-            $answer  = get_record("quiz_answers", "id", "$options->answer");       // OK to fail
+            $answersraw = get_records_list("quiz_answers", "id", "$options->answers");// OK to fail
             print_heading(get_string("editingshortanswer", "quiz"));
+            if ($answersraw) {
+                foreach ($answersraw as $answer) {
+                    $answers[] = $answer;   // to renumber index 0,1,2...
+                }
+            }
             require("shortanswer.html");
         break;
 
@@ -97,6 +106,11 @@
             $options = get_record("quiz_truefalse", "question", "$question->id");  // OK to fail
             $true    = get_record("quiz_answers", "id", "$options->true");         // OK to fail
             $false   = get_record("quiz_answers", "id", "$options->false");        // OK to fail
+            if ($true->fraction > $false->fraction) {
+                $question->answer = 1;
+            } else {
+                $question->answer = 0;
+            }
             print_heading(get_string("editingtruefalse", "quiz"));
             require("truefalse.html");
         break;

diff --git a/mod/quiz/shortanswer.html b/mod/quiz/shortanswer.html
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e604dba67e583cf7dfbc7d3cf796450d86fbe303 100644 (file)
--- a/mod/quiz/shortanswer.html
+++ b/mod/quiz/shortanswer.html
@@ -0,0 +1,112 @@
+<FORM name="theform" method="post" action="question.php">\r
+<CENTER>\r
+<TABLE cellpadding=5>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("category", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+    <?  choose_from_menu($categories, "category", "$question->category", ""); ?>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("questionname", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="name" size=50 value="<? p($question->name) ?>">\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("question", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="intro" rows=6 cols=50 wrap="virtual"><? p($question->question) ?></textarea>\r
+        <? helpbutton("text", get_string("helptext")); ?>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("imageaddress", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="image" size=80 value="<? p($question->image) ?>">\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("casesensitive", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+    <?\r
+        $options[0] = get_string("caseno", "quiz");\r
+        $options[1] = get_string("caseyes", "quiz");\r
+        choose_from_menu($options, "case", "$options->case", "");\r
+     ?>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("correctanswers", "quiz") ?></B>:</P></TD>\r
+    <TD>\r
+        <P><? print_string("filloutoneanswer", "quiz") ?></P>\r
+    </TD>\r
+\r
+\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("answer", "quiz") ?> 1:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[0]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? 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><? print_string("answer", "quiz") ?> 2:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[1]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? 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><? print_string("answer", "quiz") ?> 3:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="answer[]" size=50 value="<? p($answers[2]->answer) ?>">&nbsp;&nbsp;\r
+        <? print_string("grade", "quiz");\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><? print_string("feedback", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedback" rows=2 cols=50 wrap="virtual"><? p($answers[2]->feedback) ?></textarea>\r
+    </TD>\r
+</TR>\r
+</TABLE>\r
+\r
+<INPUT type="hidden" name=id value="<? p($question->id) ?>">\r
+<INPUT type="hidden" name=type value="<? p($question->type) ?>">\r
+<INPUT type="hidden" name=category value="<? p($question->category) ?>">\r
+<INPUT type="submit" value="<? print_string("savechanges") ?>">\r
+\r
+</CENTER>\r
+</FORM>\r

diff --git a/mod/quiz/truefalse.html b/mod/quiz/truefalse.html
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ebf30c4be4147f5c0565ce3b966548f610e5e0ca 100644 (file)
--- a/mod/quiz/truefalse.html
+++ b/mod/quiz/truefalse.html
@@ -0,0 +1,59 @@
+<FORM name="theform" method="post" action="question.php">\r
+<CENTER>\r
+<TABLE cellpadding=5>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("category", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+    <?  choose_from_menu($categories, "category", "$question->category", ""); ?>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("questionname", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="name" size=50 value="<? p($question->name) ?>">\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("question", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <textarea name="intro" rows=6 cols=50 wrap="virtual"><? p($question->question) ?></textarea>\r
+        <? helpbutton("text", get_string("helptext")); ?>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("imageaddress", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <INPUT type="text" name="image" size=80 value="<? p($question->image) ?>">\r
+    </TD>\r
+</TR>\r
+\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("correctanswer", "quiz") ?>:</B></P></TD>\r
+    <TD>\r
+        <? $menu[0] = get_string("false", "quiz");\r
+           $menu[1] = get_string("true", "quiz");\r
+           choose_from_menu($menu, "answer", "$question->answer", ""); ?>\r
+        <BR>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("feedback", "quiz") ?> (<? print_string("true", "quiz") ?>):</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedbacktrue" rows=2 cols=50 wrap="virtual"><? p($true->feedback) ?></textarea>\r
+    </TD>\r
+</TR>\r
+<TR valign=top>\r
+    <TD align=right><P><B><? print_string("feedback", "quiz") ?> (<? print_string("false", "quiz") ?>):</B></P></TD>\r
+    <TD>\r
+        <textarea name="feedbackfalse" rows=2 cols=50 wrap="virtual"><? p($false->feedback) ?></textarea>\r
+    </TD>\r
+</TR>\r
+</TABLE>\r
+\r
+<INPUT type="hidden" name=id value="<? p($question->id) ?>">\r
+<INPUT type="hidden" name=type value="<? p($question->type) ?>">\r
+<INPUT type="hidden" name=category value="<? p($question->category) ?>">\r
+<INPUT type="submit" value="<? print_string("savechanges") ?>">\r
+\r
+</CENTER>\r
+</FORM>\r