moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

After doing a quiz that has been shuffled, present the feedback in the

Browse source 
same order.  Note that shuffled ANSWERS may still appear reshuffled.

When viewing reports, all shuffling is switched off so that quizzes
always appear in the default order (for easier comparison).

Also a few tweaks, robustness etc
This commit is contained in:
moodler 2003-04-16 13:10:48 +00:00
parent 77cff58927
commit 96192c4459
3 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/quiz/attempt.php
View file

@ -78,6 +78,8 @@
$rawanswers = (array)$rawanswers; $rawanswers = (array)$rawanswers;
$shuffleorder = NULL;
unset($rawanswers["q"]); // quiz id unset($rawanswers["q"]); // quiz id
if (! count($rawanswers)) { if (! count($rawanswers)) {
print_heading(get_string("noanswers", "quiz")); print_heading(get_string("noanswers", "quiz"));
@ -116,6 +118,8 @@
} else { } else {
error("Answer received for non-existent question ($key)!"); error("Answer received for non-existent question ($key)!");
} }
} else if ($key == "shuffleorder") {
$shuffleorder = explode(",", $value); // Actual order questions were given in
} }
} }
@ -142,7 +146,9 @@
print_continue("view.php?id=$cm->id"); print_continue("view.php?id=$cm->id");
if ($quiz->feedback) { if ($quiz->feedback) {
quiz_print_quiz_questions($quiz, $result, $questions); $quiz->shufflequestions = false;
$quiz->shuffleanswers = false;
quiz_print_quiz_questions($quiz, $result, $questions, $shuffleorder);
print_continue("view.php?id=$cm->id"); print_continue("view.php?id=$cm->id");
} }

33
mod/quiz/lib.php
View file

@ -565,14 +565,16 @@ function quiz_print_question($number, $question, $grade, $courseid,
if (!$subquestions = get_records_list("quiz_match_sub", "id", $options->subquestions)) { if (!$subquestions = get_records_list("quiz_match_sub", "id", $options->subquestions)) {
notify("Error: Missing subquestions for this question!"); notify("Error: Missing subquestions for this question!");
} }
if ($shuffleanswers) { if (!empty($question->questiontext)) {
$subquestions = draw_rand_array($subquestions, count($subquestions)); echo text_to_html($question->questiontext);
} }
echo text_to_html($question->questiontext); if (!empty($question->image)) {
if ($question->image) {
print_file_picture($question->image, $courseid, QUIZ_PICTURE_DEFAULT_HEIGHT); print_file_picture($question->image, $courseid, QUIZ_PICTURE_DEFAULT_HEIGHT);
} }
if ($shuffleanswers) {
$subquestions = draw_rand_array($subquestions, count($subquestions));
}
foreach ($subquestions as $subquestion) { foreach ($subquestions as $subquestion) {
$answers[$subquestion->id] = $subquestion->answertext; $answers[$subquestion->id] = $subquestion->answertext;
} }
@ -711,7 +713,7 @@ function quiz_print_question($number, $question, $grade, $courseid,
function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL) { function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuffleorder=NULL) {
// Prints a whole quiz on one page. // Prints a whole quiz on one page.
/// Get the questions /// Get the questions
@ -727,7 +729,13 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL) {
return false; return false;
} }
if (!empty($quiz->shufflequestions)) { 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
}
} else if (!empty($quiz->shufflequestions)) { // Mix everything up
$questions = swapshuffle_assoc($questions); $questions = swapshuffle_assoc($questions);
} }
} }
@ -772,8 +780,11 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL) {
echo "<INPUT TYPE=hidden NAME=q VALUE=\"$quiz->id\">"; echo "<INPUT TYPE=hidden NAME=q VALUE=\"$quiz->id\">";
$count = 0; $count = 0;
$questionorder = array();
foreach ($questions as $question) { foreach ($questions as $question) {
$count++; $count++;
$questionorder[] = $question->id;
$feedback = NULL; $feedback = NULL;
$response = NULL; $response = NULL;
@ -814,13 +825,17 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL) {
$feedback, $response, $actualgrades, $correct, $feedback, $response, $actualgrades, $correct,
$randomquestion, $quiz->shuffleanswers); $randomquestion, $quiz->shuffleanswers);
print_simple_box_end(); print_simple_box_end();
echo "<BR>"; echo "<br \>";
} }
if (empty($results)) { if (empty($results)) {
echo "<CENTER><INPUT TYPE=submit VALUE=\"".get_string("savemyanswers", "quiz")."\"></CENTER>"; if (!empty($quiz->shufflequestions)) { // Things have been mixed up, so pass the question order
$shuffleorder = implode(',', $questionorder);
echo "<input type=hidden name=shuffleorder value=\"$shuffleorder\">\n";
}
echo "<center><input type=submit value=\"".get_string("savemyanswers", "quiz")."\"></center>";
} }
echo "</FORM>"; echo "</form>";
return true; return true;
} }

2
mod/quiz/report.php
View file

@ -126,6 +126,8 @@
$quiz->feedback = true; $quiz->feedback = true;
$quiz->correctanswers = true; $quiz->correctanswers = true;
$quiz->shuffleanswers = false;
$quiz->shufflequestions = false;
quiz_print_quiz_questions($quiz, $result, $questions); quiz_print_quiz_questions($quiz, $result, $questions);
if (empty($review)) { if (empty($review)) {