From 6559096f2c2babf01ab910a794c6e3a06a4817e7 Mon Sep 17 00:00:00 2001
From: jamiesensei <jamiesensei>
Date: Mon, 21 Jul 2008 09:06:46 +0000
Subject: [PATCH] MDL-15728 "quiz_report_load_questions should alias qqi.grade
 to maxgrade so that questions array has the required fields expected by much
 of the question code."

---
 mod/quiz/report/grading/report.php            |  1 -
 mod/quiz/report/overview/report.php           |  2 +-
 mod/quiz/report/reportlib.php                 |  5 +----
 mod/quiz/report/responses/report.php          | 12 +++++++-----
 mod/quiz/report/responses/responses_table.php |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index d6e2789ce5..2dbd5264a1 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -91,7 +91,6 @@ class quiz_grading_report extends quiz_default_report {
             } else {
                 $question =& $gradeableqs[$questionid];
             }
-            $question->maxgrade = $DB->get_field('quiz_question_instances', 'grade', array('quiz' => $quiz->id, 'question' => $question->id));
 
             // Some of the questions code is optimised to work with several questions
             // at once so it wants the question to be in an array. The array key
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 9a467544c9..668ecc8f3d 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -359,7 +359,7 @@ class quiz_overview_report extends quiz_default_report {
                     } else {
                         $header .=' ';
                     }
-                    $header .='--/'.quiz_rescale_grade($question->grade, $quiz);
+                    $header .='--/'.quiz_rescale_grade($question->maxgrade, $quiz);
                     $headers[] = $header;
                  }
             }
diff --git a/mod/quiz/report/reportlib.php b/mod/quiz/report/reportlib.php
index e50cf74cfb..3ffd28aad5 100644
--- a/mod/quiz/report/reportlib.php
+++ b/mod/quiz/report/reportlib.php
@@ -137,9 +137,6 @@ function quiz_format_average_grade_for_questions($avggradebyq, $questions, $quiz
         } else {
             $grade = '--';
         }
-        if (!$download) {
-            $grade = $grade.'/'.quiz_rescale_grade($questions[$questionid]->grade, $quiz);
-        }
         $row['qsgrade'.$questionid]= $grade;
     }
     return $row;
@@ -159,7 +156,7 @@ function quiz_report_load_questions($quiz){
     //since this double check will probably do no harm.
     list($usql, $params) = $DB->get_in_or_equal(explode(',', $questionlist));
     $params[] = $quiz->id;
-    if (!$questions = $DB->get_records_sql("SELECT q.*, qqi.grade
+    if (!$questions = $DB->get_records_sql("SELECT q.*, qqi.grade AS maxgrade
             FROM {question} q,
             {quiz_question_instances} qqi
             WHERE q.id $usql AND
diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
index f07df26177..ea8b062355 100644
--- a/mod/quiz/report/responses/report.php
+++ b/mod/quiz/report/responses/report.php
@@ -188,7 +188,8 @@ class quiz_responses_report extends quiz_default_report {
             
             $fields .='qa.uniqueid AS attemptuniqueid, qa.id AS attempt, u.id AS userid, u.idnumber, u.firstname,'.
                 ' u.lastname, u.institution, u.department, u.email, u.picture, u.imagealt, '.
-                'qa.sumgrades, qa.timefinish, qa.timestart, qa.timefinish - qa.timestart AS duration ';
+                'qa.sumgrades, qa.timefinish, qa.timestart, qa.timefinish - qa.timestart AS duration, ' .
+                'qa.layout ';
     
             // This part is the same for all cases - join users and quiz_attempts tables
             $from = '{user} u ';
@@ -281,6 +282,11 @@ class quiz_responses_report extends quiz_default_report {
                 $columns[] = 'sumgrades';
                 $headers[] = get_string('grade', 'quiz').'/'.$quiz->grade;
             }
+
+            if ($hasfeedback) {
+                $columns[] = 'feedbacktext';
+                $headers[] = get_string('feedback', 'quiz');
+            }
         
             // we want to display responses for all questions
             foreach ($questions as $id => $question) {
@@ -289,10 +295,6 @@ class quiz_responses_report extends quiz_default_report {
                 $headers[] = '#'.$question->number;
             }
     
-            if ($hasfeedback) {
-                $columns[] = 'feedbacktext';
-                $headers[] = get_string('feedback', 'quiz');
-            }
     
             // Load the question type specific information
             if (!get_question_options($questions)) {
diff --git a/mod/quiz/report/responses/responses_table.php b/mod/quiz/report/responses/responses_table.php
index 99a8967870..f2576ce755 100644
--- a/mod/quiz/report/responses/responses_table.php
+++ b/mod/quiz/report/responses/responses_table.php
@@ -64,7 +64,7 @@ class quiz_report_responses_table extends table_sql {
                 echo '<a href="javascript:deselect_all_in(\'DIV\',null,\'tablecontainer\');">'.
                         get_string('selectnone', 'quiz').'</a> ';
                 echo '&nbsp;&nbsp;';
-                echo '<input type="submit" value="'.get_string('deleteselected', 'quiz_responses').'"/>';
+                echo '<input type="submit" value="'.get_string('deleteselected', 'quiz_overview').'"/>';
                 echo '</td></tr></table>';
                 // Close form
                 echo '</div>';
-- 
2.39.5