From b6943d373106fcef8e8214a73dc190186b9f3570 Mon Sep 17 00:00:00 2001 From: jamiesensei Date: Tue, 15 Jul 2008 07:22:26 +0000 Subject: [PATCH] MDL-14216 "Improvements to regrade report - improved reporting of actions and dry run / regrade" if condition around buttons to not output them when downloading table data. --- mod/quiz/report/overview/report.php | 58 +++++++++++++++-------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index 329bf37d7f..59aa06687f 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -199,37 +199,39 @@ class quiz_overview_report extends quiz_default_report { $mform->display(); } - $countregradeneeded = $this->count_regrade_all_needed($quiz, $groupstudents); - //regrade buttons - if ($currentgroup){ - $a= new object(); - $a->groupname = groups_get_group_name($currentgroup); - $a->coursestudents = $COURSE->students; - $a->countregradeneeded = $countregradeneeded; - $regradealldrydolabel = get_string('regradealldrydogroup', 'quiz_overview', $a); - $regradealldrylabel = get_string('regradealldrygroup', 'quiz_overview', $a); - $regradealllabel = get_string('regradeallgroup', 'quiz_overview', $a); - } else { - $regradealldrydolabel = get_string('regradealldrydo', 'quiz_overview', $countregradeneeded); - $regradealldrylabel = get_string('regradealldry', 'quiz_overview'); - $regradealllabel = get_string('regradeall', 'quiz_overview'); - } + - if (has_capability('mod/quiz:grade', $this->context)){ - echo '
'; - echo '
'; - echo '
'; - echo $reporturl->hidden_params_out(array(), 0, $displayoptions); - echo ''; - echo ''; - if ($countregradeneeded){ - echo ''; + if (!$table->is_downloading()) { //do not print notices when downloading + $countregradeneeded = $this->count_regrade_all_needed($quiz, $groupstudents); + //regrade buttons + if ($currentgroup){ + $a= new object(); + $a->groupname = groups_get_group_name($currentgroup); + $a->coursestudents = $COURSE->students; + $a->countregradeneeded = $countregradeneeded; + $regradealldrydolabel = get_string('regradealldrydogroup', 'quiz_overview', $a); + $regradealldrylabel = get_string('regradealldrygroup', 'quiz_overview', $a); + $regradealllabel = get_string('regradeallgroup', 'quiz_overview', $a); + } else { + $regradealldrydolabel = get_string('regradealldrydo', 'quiz_overview', $countregradeneeded); + $regradealldrylabel = get_string('regradealldry', 'quiz_overview'); + $regradealllabel = get_string('regradeall', 'quiz_overview'); + } + if (has_capability('mod/quiz:grade', $this->context)){ + echo '
'; + echo ''; + echo '
'; + echo $reporturl->hidden_params_out(array(), 0, $displayoptions); + echo ''; + echo ''; + if ($countregradeneeded){ + echo ''; + } + echo '
'; + echo ''; + echo '
'; } - echo '
'; - echo ''; - echo '
'; } - if (!$nostudents || ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL)){ // Print information on the grading method and whether we are displaying // -- 2.39.5