Merge branch 'MDL-42125' of git://github.com/timhunt/moodle

mod/quiz/report/statistics/lang/en/quiz_statistics.php

@@ -81,6 +81,7 @@
 Our equation for effective question weight cannot be calculated in this case. The calculations for effective question weight for other questions in this quiz are the effective question weight for these questions if the highlighted questions with a negative covariance are given a maximum grade of zero.
 
 If you edit a quiz and give these question(s) with negative covariance a max grade of zero then the effective question weight of these questions will be zero and the real effective question weight of other questions will be as calculated now.';
+$string['nogradedattempts'] = 'No attempts have been made at this quiz, or all attempts have questions that need manual grading.';
 $string['nostudentsingroup'] = 'There are no students in this group yet';
 $string['optiongrade'] = 'Partial credit';
 $string['partofquestion'] = 'Part of question';

mod/quiz/report/statistics/report.php

@@ -168,7 +168,7 @@ public function display($quiz, $cm, $course) {
             }
 
             if (!$this->table->is_downloading() && $quizstats->s() == 0) {
-                echo $OUTPUT->notification(get_string('noattempts', 'quiz'));
+                echo $OUTPUT->notification(get_string('nogradedattempts', 'quiz_statistics'));
             }
 
             foreach ($questionstats->any_error_messages() as $errormessage) {
@@ -259,7 +259,7 @@ public function display($quiz, $cm, $course) {
             // On-screen display of overview report.
             echo $OUTPUT->heading(get_string('quizinformation', 'quiz_statistics'), 3);
             echo $this->output_caching_info($quizstats->timemodified, $quiz->id, $groupstudents, $whichattempts, $reporturl);
-            echo $this->everything_download_options();
+            echo $this->everything_download_options($reporturl);
             $quizinfo = $quizstats->get_formatted_quiz_info_data($course, $cm, $quiz);
             echo $this->output_quiz_info_table($quizinfo);
             if ($quizstats->s()) {
@@ -735,13 +735,14 @@ protected function analyse_responses_for_questions($questions, $qubaids, $whicht
      * Return a little form for the user to request to download the full report, including quiz stats and response analysis for
      * all questions and sub-questions.
      *
+     * @param moodle_url $reporturl the base URL of the report.
+     *
      * @return string HTML.
      */
-    protected function everything_download_options() {
+    protected function everything_download_options(moodle_url $reporturl) {
         global $OUTPUT;
-
         return $OUTPUT->download_dataformat_selector(get_string('downloadeverything', 'quiz_statistics'),
-            $this->table->baseurl->out_omit_querystring(), 'download', $this->table->baseurl->params() + array('everything' => 1));
+            $reporturl->out_omit_querystring(), 'download', $reporturl->params() + array('everything' => 1));
     }
 
     /**