MDL-15728 "quiz_report_load_questions should alias qqi.grade to maxgrade so that...

diff --git a/mod/quiz/report/statistics/qstats.php b/mod/quiz/report/statistics/qstats.php
index 96e3d701d3a29553938a4fb1b6ecb094e371e519..c5460269744fedc965a35a481ed39544690363d3 100644 (file)
--- a/mod/quiz/report/statistics/qstats.php
+++ b/mod/quiz/report/statistics/qstats.php
@@ -122,8 +122,8 @@ class qstats{
                         $subquestionstats[$itemid] = $this->stats_init_object();
                         $subquestionstats[$itemid]->usedin = array();
                         $subquestionstats[$itemid]->differentweights = false;
-                        $subquestionstats[$itemid]->grade = $this->questions[$state->question]->grade;
-                    } else if ($subquestionstats[$itemid]->grade != $this->questions[$state->question]->grade){
+                        $subquestionstats[$itemid]->maxgrade = $this->questions[$state->question]->maxgrade;
+                    } else if ($subquestionstats[$itemid]->maxgrade != $this->questions[$state->question]->maxgrade){
                         $subquestionstats[$itemid]->differentweights = true;
                     }
                     $this->_initial_states_walker($state, $subquestionstats[$itemid], false);
@@ -135,15 +135,15 @@ class qstats{
         $this->subquestions = question_load_questions(array_keys($subquestionstats));
         foreach (array_keys($this->subquestions) as $qid){
             $this->subquestions[$qid]->_stats = $subquestionstats[$qid];
-            $this->subquestions[$qid]->grade = $this->subquestions[$qid]->_stats->grade;
+            $this->subquestions[$qid]->maxgrade = $this->subquestions[$qid]->_stats->maxgrade;
             $this->subquestions[$qid]->subquestion = true;
-            $this->_initial_question_walker($this->subquestions[$qid]->_stats, $this->subquestions[$qid]->_stats->grade);
+            $this->_initial_question_walker($this->subquestions[$qid]->_stats, $this->subquestions[$qid]->_stats->maxgrade);
             if ($subquestionstats[$qid]->differentweights){
                 notify(get_string('erroritemappearsmorethanoncewithdifferentweight', 'quiz_statistics', $this->subquestions[$qid]->name));
             }
         }
         foreach (array_keys($this->questions) as $qid){
-            $this->_initial_question_walker($this->questions[$qid]->_stats, $this->questions[$qid]->grade);
+            $this->_initial_question_walker($this->questions[$qid]->_stats, $this->questions[$qid]->maxgrade);
             $this->questions[$qid]->subquestion = false;
         }
         //go through the records one more time

diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index 580ce9e031f2ab6100eb28a61334f19c25dbcf25..5393b9feb1ebe7661ae76a8435a8fb7005068d1e 100644 (file)
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -121,7 +121,7 @@ class quiz_report_statistics_table extends flexible_table {
         return $question->qtype;
     }
     function col_intended_weight($question){
-        return quiz_report_scale_sumgrades_as_percentage($question->grade, $this->quiz);
+        return quiz_report_scale_sumgrades_as_percentage($question->maxgrade, $this->quiz);
     }
     function col_effective_weight($question){
         if (!$question->subquestion){
@@ -154,7 +154,7 @@ class quiz_report_statistics_table extends flexible_table {
     }
     
     function col_sd($question){
-        return number_format($question->_stats->sd*100 / $question->grade, 2).' %';
+        return number_format($question->_stats->sd*100 / $question->maxgrade, 2).' %';
     }
     function col_s($question){
         if (isset($question->_stats->s)){