For the overview report : MDL-14199 "Option to only show / export final grade" small...

Merged from 1.9 branch.

diff --git a/lang/en_utf8/quiz_overview.php b/lang/en_utf8/quiz_overview.php
index 1bb41d4156622898c8d4e5a9170232f6495330dd..3b3c496624e6c09426284158bb456c861773fb3b 100644 (file)
--- a/lang/en_utf8/quiz_overview.php
+++ b/lang/en_utf8/quiz_overview.php
@@ -15,7 +15,7 @@ $string['optallattempts'] = 'all attempts';
 $string['optallstudents'] = 'all \'$a\'';
 $string['optattemptsonly'] = '\'$a\' with attempts only';
 $string['optnoattemptsonly'] = '\'$a\' with no attempts only';
-$string['optonlygradedattempts'] = 'only the attempt that is graded for each user';
+$string['optonlygradedattempts'] = 'only the attempt that is graded for each user ($a)';
 $string['overview'] = 'Overview';
 $string['overviewdownload'] = 'Overview download';
 $string['overviewdownload'] = 'Overview download';

diff --git a/mod/quiz/report/overview/overviewsettings_form.php b/mod/quiz/report/overview/overviewsettings_form.php
index cf9c765321fd6fe4d7af478dfd179623b889a852..9adffff28a85bdeb3a2a06e70bbbac0d319d7563 100644 (file)
--- a/mod/quiz/report/overview/overviewsettings_form.php
+++ b/mod/quiz/report/overview/overviewsettings_form.php
@@ -18,7 +18,8 @@ class mod_quiz_report_overview_settings extends moodleform {
         }
         $mform->addElement('select', 'attemptsmode', get_string('show', 'quiz_overview'), $options);
         if ($this->_customdata['qmsubselect']){
-            $mform->addElement('advcheckbox', 'qmfilter', get_string('show', 'quiz_overview'), get_string('optonlygradedattempts', 'quiz_overview'), null, array(0,1));
+            $gm = '<span class="highlight">'.quiz_get_grading_option_name($this->_customdata['quiz']->grademethod).'</span>';
+            $mform->addElement('advcheckbox', 'qmfilter', get_string('show', 'quiz_overview'), get_string('optonlygradedattempts', 'quiz_overview', $gm), null, array(0,1));
         }
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('preferencesuser', 'quiz_overview'));

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 8b22adf37b883ae7db4f91ffc74b973a28431b17..3ff3e3f83ea87f431592e80d5e4e41be3c64a606 100644 (file)
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -66,7 +66,7 @@ class quiz_report extends quiz_default_report {
 
         $reporturl = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', $pageoptions);
         $qmsubselect = quiz_report_qm_filter_subselect($quiz);
-        $mform = new mod_quiz_report_overview_settings($reporturl, compact('qmsubselect'));
+        $mform = new mod_quiz_report_overview_settings($reporturl, compact('qmsubselect', 'quiz'));
         if ($fromform = $mform->get_data()){
             $attemptsmode = $fromform->attemptsmode;
             if ($qmsubselect){