diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php index 58e316c5e59..465e1df6b01 100644 --- a/mod/quiz/report/default.php +++ b/mod/quiz/report/default.php @@ -31,11 +31,6 @@ class quiz_default_report { $PAGE->set_heading($course->fullname); echo $OUTPUT->header(); $course_context = get_context_instance(CONTEXT_COURSE, $course->id); - if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)) { - echo '
' - . get_string('seeallcoursegrades', 'grades') . '
'; - } - } } diff --git a/mod/quiz/report/overview/lang/en/quiz_overview.php b/mod/quiz/report/overview/lang/en/quiz_overview.php index af7627c7eef..ca919fd584e 100644 --- a/mod/quiz/report/overview/lang/en/quiz_overview.php +++ b/mod/quiz/report/overview/lang/en/quiz_overview.php @@ -64,9 +64,9 @@ $string['regradealldrygroup'] = 'Dry run a full regrade for group \'{$a->groupna $string['regradeallgroup'] = 'Full regrade for group \'{$a->groupname}\''; $string['regradeheader'] = 'Regrading'; $string['regradeselected'] = 'Regrade selected attempts'; -$string['show'] = 'Show / download'; -$string['showattempts'] = 'Only show / download attempts'; -$string['showdetailedmarks'] = 'Show / download marks for each question'; +$string['show'] = 'Include'; +$string['showattempts'] = 'Include attempts'; +$string['showdetailedmarks'] = 'Marks for each question'; $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['studentingroup'] = '\'{$a->coursestudent}\' in group \'{$a->groupname}\''; diff --git a/mod/quiz/report/overview/overviewsettings_form.php b/mod/quiz/report/overview/overviewsettings_form.php index 7e9e1ad555e..b7be5bc2102 100644 --- a/mod/quiz/report/overview/overviewsettings_form.php +++ b/mod/quiz/report/overview/overviewsettings_form.php @@ -51,7 +51,7 @@ class mod_quiz_report_overview_settings extends moodleform { $mform->addElement('selectyesno', 'detailedmarks', get_string('showdetailedmarks', 'quiz_overview')); - $this->add_action_buttons(false, get_string('preferencessave', 'quiz_overview')); + $mform->addElement('submit', 'submitbutton', get_string('preferencessave', 'quiz_overview')); } } diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index 48e15ebb477..b32b3d5bf5d 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -176,12 +176,6 @@ class quiz_overview_report extends quiz_default_report { } } - // Print information on the number of existing attempts - if (!$table->is_downloading()) { //do not print notices when downloading - if ($strattemptnum = quiz_num_attempt_summary($quiz, $cm, true, $currentgroup)) { - echo '
' . $strattemptnum . '
'; - } - } $nostudents = false; if (!$students) { echo $OUTPUT->notification(get_string('nostudentsyet')); @@ -194,8 +188,13 @@ class quiz_overview_report extends quiz_default_report { // Print display options $mform->set_data($displayoptions +compact('detailedmarks', 'pagesize')); $mform->display(); - } + // Print information on the number of existing attempts + if ($strattemptnum = quiz_num_attempt_summary($quiz, $cm, true, $currentgroup)) { + echo '
' . $strattemptnum . '
'; + } + } + if (!$nostudents || ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL)) { // Construct the SQL diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php index 83e8ece53c9..72d367ef7ad 100644 --- a/mod/quiz/report/responses/report.php +++ b/mod/quiz/report/responses/report.php @@ -146,12 +146,7 @@ class quiz_responses_report extends quiz_default_report { groups_print_activity_menu($cm, $reporturl->out(true, $displayoptions)); } } - // Print information on the number of existing attempts - if (!$table->is_downloading()) { //do not print notices when downloading - if ($strattemptnum = quiz_num_attempt_summary($quiz, $cm, true, $currentgroup)) { - echo '
' . $strattemptnum . '
'; - } - } + $nostudents = false; if (!$students) { echo $OUTPUT->notification(get_string('nostudentsyet')); @@ -166,6 +161,13 @@ class quiz_responses_report extends quiz_default_report { $mform->display(); } + // Print information on the number of existing attempts + if (!$table->is_downloading()) { //do not print notices when downloading + if ($strattemptnum = quiz_num_attempt_summary($quiz, $cm, true, $currentgroup)) { + echo '
' . $strattemptnum . '
'; + } + } + if (!$nostudents || ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL)) { // Print information on the grading method and whether we are displaying // diff --git a/mod/quiz/report/responses/responsessettings_form.php b/mod/quiz/report/responses/responsessettings_form.php index a3c9024960a..d0039bec3d1 100644 --- a/mod/quiz/report/responses/responsessettings_form.php +++ b/mod/quiz/report/responses/responsessettings_form.php @@ -33,7 +33,7 @@ class mod_quiz_report_responses_settings extends moodleform { $mform->addElement('select', 'attemptsmode', get_string('show', 'quiz_overview'), $options); if ($this->_customdata['qmsubselect']){ $gm = ''.quiz_get_grading_option_name($this->_customdata['quiz']->grademethod).''; - $mform->addElement('advcheckbox', 'qmfilter', get_string('show', 'quiz_overview'), get_string('optonlygradedattempts', 'quiz_overview', $gm), null, array(0,1)); + $mform->addElement('advcheckbox', 'qmfilter', get_string('showattempts', 'quiz_overview'), get_string('optonlygradedattempts', 'quiz_overview', $gm), null, array(0,1)); } //------------------------------------------------------------------------------- $mform->addElement('header', 'preferencesuser', get_string('preferencesuser', 'quiz_overview')); @@ -41,6 +41,6 @@ class mod_quiz_report_responses_settings extends moodleform { $mform->addElement('text', 'pagesize', get_string('pagesize', 'quiz_overview')); $mform->setType('pagesize', PARAM_INT); - $this->add_action_buttons(false, get_string('preferencessave', 'quiz_overview')); + $mform->addElement('submit', 'submitbutton', get_string('preferencessave', 'quiz_overview')); } } diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php index ae456ed4ec7..9133db55f07 100644 --- a/mod/quiz/report/statistics/report.php +++ b/mod/quiz/report/statistics/report.php @@ -410,7 +410,7 @@ class quiz_statistics_report extends quiz_default_report { if (!$a->count = $DB->count_records_sql($sql, array('time'=>$quizstats->timemodified)+$qaparams)){ $a->count = 0; } - $quizinformationtablehtml .= $OUTPUT->box_start('boxaligncenter generalbox boxwidthnormal mdl-align'); + $quizinformationtablehtml .= $OUTPUT->box_start('boxaligncenter generalbox boxwidthnormal mdl-align', 'cachingnotice'); $quizinformationtablehtml .= get_string('lastcalculated', 'quiz_statistics', $a); $aurl = new moodle_url($reporturl->out_omit_querystring(), $reporturl->params() + array('recalculate' => 1, 'sesskey' => sesskey())); $quizinformationtablehtml .= $OUTPUT->single_button($aurl, get_string('recalculatenow', 'quiz_statistics')); diff --git a/mod/quiz/report/statistics/statistics_form.php b/mod/quiz/report/statistics/statistics_form.php index 9deb6d14f4d..7bdc068d37a 100644 --- a/mod/quiz/report/statistics/statistics_form.php +++ b/mod/quiz/report/statistics/statistics_form.php @@ -14,7 +14,7 @@ class mod_quiz_report_statistics extends moodleform { $mform->addElement('select', 'useallattempts', get_string('calculatefrom', 'quiz_statistics'), $options); $mform->setDefault('useallattempts', 0); //------------------------------------------------------------------------------- - $this->add_action_buttons(false, get_string('preferencessave', 'quiz_overview')); + $mform->addElement('submit', 'submitbutton', get_string('preferencessave', 'quiz_overview')); } } diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index f305594520b..bfc3bb3c732 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -100,7 +100,7 @@ table#categoryquestions td, #page-mod-quiz-report #manualgradingform .que {margin-bottom: 0.7em;} #page-mod-quiz-report table.titlesleft td.c0{font-weight: bold;} #page-mod-quiz-report table .numcol {text-align: center;vertical-align : middle !important;} -#page-mod-quiz-report table#attempts {clear: both;width: 80%;margin: 20px auto;} +#page-mod-quiz-report table#attempts {clear: both;width: 80%; margin: 0.2em auto;} #page-mod-quiz-report table#attempts .header, #page-mod-quiz-report table#attempts .cell{padding: 4px;} #page-mod-quiz-report table#attempts .header .commands {display: inline;} @@ -117,6 +117,9 @@ table#categoryquestions td, #page-mod-quiz-report table#itemanalysis .partialcorrect {color: green !important;} #page-mod-quiz-report table#itemanalysis .cell{padding: 4px;} #page-mod-quiz-report table#itemanalysis .qname {color: green !important;} +#page-mod-quiz-report fieldset.felement.fgroup {margin: 0;} +#page-mod-quiz-report #cachingnotice {margin-bottom: 1em; padding: 0.2em; } +#page-mod-quiz-report #cachingnotice .singlebutton {margin: 0.5em 0 0;} /** Mod quiz grading **/ #page-mod-quiz-grading table#grading {width: 80%;margin: 20px auto;} @@ -166,7 +169,7 @@ table.quizreviewsummary td.cell {padding: 1px 1em 1px 0.5em;text-align: left;bac body#question-preview .quemodname, body#question-preview .controls{text-align: center;} -.quizattemptcounts {clear : left;text-align: center;margin: 6px 0;} +.quizattemptcounts {clear: left; text-align: center;} .generalbox#passwordbox { /* Should probably match .generalbox#intro above */width:70%;margin-left:auto;margin-right:auto;} #passwordform {margin: 1em 0;}