diff --git a/lang/en_utf8/quiz_overview.php b/lang/en_utf8/quiz_overview.php index 0fa8ca95abd..1bb41d41566 100644 --- a/lang/en_utf8/quiz_overview.php +++ b/lang/en_utf8/quiz_overview.php @@ -3,11 +3,14 @@ $string['allattempts'] = 'Show all attempts'; +$string['allattemptscontributetograde'] = 'All attempts contribute to final grade for user.'; $string['allstudents'] = 'Show all $a'; $string['attemptsonly'] = 'Show $a with attempts only'; $string['attemptsprepage'] = 'Attempts shown per page'; $string['deleteselected'] = 'Delete selected attempts'; +$string['highlightinggraded'] = 'The user attempt that contributes to final grade is highlighted.'; $string['noattemptsonly'] = 'Show $a with no attempts only'; +$string['onlyoneattemptallowed'] = 'Only one attempt per user allowed on this quiz.'; $string['optallattempts'] = 'all attempts'; $string['optallstudents'] = 'all \'$a\''; $string['optattemptsonly'] = '\'$a\' with attempts only'; @@ -22,5 +25,7 @@ $string['preferencespage'] = 'Preferences just for this page'; $string['preferencessave'] = 'Save preferences'; $string['preferencesuser'] = 'Your preferences for this report'; $string['show'] = 'Show'; +$string['showinggraded'] = 'Showing only the attempt graded for each user.'; +$string['showinggradedandungraded'] = 'Showing graded and ungraded attempts for each user. The one attempt for each user that is graded is highlighted. The grading method for this quiz is $a.'; $string['showdetailedmarks'] = 'Show marks for each question'; ?> diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index f0f3db3baac..44f716bc6fa 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -65,7 +65,7 @@ class quiz_report extends quiz_default_report { $pageoptions['mode'] = 'overview'; $reporturl = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', $pageoptions); - $qmsubselect = quiz_report_qm_filter_subselect($quiz->grademethod); + $qmsubselect = quiz_report_qm_filter_subselect($quiz); $mform = new mod_quiz_report_overview_settings($reporturl, compact('qmsubselect')); if ($fromform = $mform->get_data()){ $attemptsmode = $fromform->attemptsmode; @@ -117,6 +117,14 @@ class quiz_report extends quiz_default_report { } } + // Print information on the grading method and whether we are displaying + // + if (!$download) { //do not print notices when downloading + if ($strattempthighlight = quiz_report_highlighting_grading_method($quiz, $qmsubselect, $qmfilter)) { + echo '
".get_string('onlyoneattemptallowed', "quiz_overview")."
"; + } else if (!$qmsubselect){ + return "".get_string('allattemptscontributetograde', "quiz_overview")."
"; + } else if ($qmfilter){ + return "".get_string('showinggraded', "quiz_overview")."
"; + }else { + return "".get_string('showinggradedandungraded', "quiz_overview", + (''.quiz_get_grading_option_name($quiz->grademethod).''))."
"; + } +} ?>