Better errors (include question name)

diff --git a/mod/quiz/format/webct/format.php b/mod/quiz/format/webct/format.php
index b0a927f19bbfc84969f03d007bcfc45580fef5ec..0688dccac7b240b07184aec185b6ce1c05274afe 100644 (file)
--- a/mod/quiz/format/webct/format.php
+++ b/mod/quiz/format/webct/format.php
@@ -362,7 +362,7 @@ class quiz_file_format extends quiz_default_format {
                             case SHORTANSWER:
                                 if ($maxfraction != 1) {
                                     $maxfraction = $maxfraction * 100;
-                                    $errors[] = get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
+                                    $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
                                     $QuestionOK = FALSE;
                                 }
                                 break;
@@ -371,14 +371,15 @@ class quiz_file_format extends quiz_default_format {
                                 if ($question->single) {
                                     if ($maxfraction != 1) {
                                         $maxfraction = $maxfraction * 100;
-                                        $errors[] = get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
+                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
                                         $QuestionOK = FALSE;
                                     }
                                 } else {
                                     $totalfraction = round($totalfraction,2);
                                     if ($totalfraction != 1) {
+                                echo "<p>$totalfraction</p>";
                                         $totalfraction = $totalfraction * 100;
-                                        $errors[] = get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsaddwrong", "quiz", $totalfraction);
+                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsaddwrong", "quiz", $totalfraction);
                                         $QuestionOK = FALSE;
                                     }
                                 }
@@ -387,7 +388,7 @@ class quiz_file_format extends quiz_default_format {
                             case CALCULATED:
                                 foreach ($question->answers as $answer) {
                                     if ($formulaerror = quiz_qtype_calculated_find_formula_errors($answer->answer)) {
-                                        $warnings[] = $formulaerror;
+                                        $warnings[] = "'$question->name': ". $formulaerror;
                                         $QuestionOK = FALSE;
                                     }
                                 }
@@ -550,8 +551,7 @@ class quiz_file_format extends quiz_default_format {
                 $question->answers[$currentchoice]->feedback = '';
                 $question->answers[$currentchoice]->correctanswerlength = 4;
                 
-                $datasetnames = $qtypecalculated
-                        ->find_dataset_names($webct_options[1]);
+                $datasetnames = $qtypecalculated->find_dataset_names($webct_options[1]);
                 foreach ($datasetnames as $datasetname) {
                     $question->datasets[$datasetname]->items = array();
                 }