where the correct responses on a JQuiz multiple choice question all have a score...

diff --git a/question/format/hotpot/format.php b/question/format/hotpot/format.php
index b08f0218a810936b728f3079e731f81f136dc12f..d3fd3119ec76159ca745963413ab0cd95783bd32 100644 (file)
--- a/question/format/hotpot/format.php
+++ b/question/format/hotpot/format.php
@@ -420,6 +420,9 @@ class qformat_hotpot extends qformat_default {
                 $question->answer = array();
                 $question->fraction = array();
                 $question->feedback = array();
+                $aa = 0;
+                $correct_answers = array();
+                $correct_answers_all_zero = true;
                 while (($answer = $answers."['answer'][$a]['#']") && $xml->xml_value($tags, $answer)) {
                     $correct = $xml->xml_value($tags, $answer."['correct'][0]['#']");
                     if (empty($correct)) {
@@ -439,12 +442,26 @@ class qformat_hotpot extends qformat_default {
                     }
                     $answertext = $this->hotpot_prepare_str($xml->xml_value($tags, $answer."['text'][0]['#']"));
                     if ($answertext!='') {
-                        $question->answer[] = $answertext;
-                        $question->fraction[] = $fraction;
-                        $question->feedback[] = $this->hotpot_prepare_str($xml->xml_value($tags, $answer."['feedback'][0]['#']"));
+                        $question->answer[$aa] = $answertext;
+                        $question->fraction[$aa] = $fraction;
+                        $question->feedback[$aa] = $this->hotpot_prepare_str($xml->xml_value($tags, $answer."['feedback'][0]['#']"));
+                        if ($correct) {
+                            if ($fraction) {
+                                $correct_answers_all_zero = false;
+                            }
+                            $correct_answers[] = $aa;
+                        }
+                        $aa++;
                     }
                     $a++;
                 }
+                if ($correct_answers_all_zero) {
+                    // correct answers all have score of 0%, 
+                    // so reset score for correct answers 100%
+                    foreach ($correct_answers as $aa) {
+                        $question->fraction[$aa] = 1;
+                    }
+                }
                 $questions[] = $question;
                 $q++;
             }