From 63be47d932e1d4179c091562f9fbb0e73f063003 Mon Sep 17 00:00:00 2001 From: Dean Lennard Date: Wed, 27 Apr 2011 16:43:48 +0100 Subject: [PATCH] MDL-20636 Made changes to the three files and code checked --- mod/quiz/attempt.php | 4 +- mod/quiz/renderer.php | 115 +++++++++++++++++++++++++++++++++++++----- mod/quiz/summary.php | 61 +--------------------- 3 files changed, 105 insertions(+), 75 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 178852ed682..8c4605b10f4 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -78,8 +78,8 @@ $accessmanager = $attemptobj->get_access_manager(time()); $messages = $accessmanager->prevent_access(); $output = $PAGE->get_renderer('mod_quiz'); if (!$attemptobj->is_preview_user() && $messages) { -print_error('attempterror', 'quiz', $attemptobj->view_url(), - $output->print_messages($messages)); + print_error('attempterror', 'quiz', $attemptobj->view_url(), + $output->print_messages($messages)); } $accessmanager->do_password_check($attemptobj->is_preview_user()); diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php index 7843beb8b1a..3c09520dc51 100644 --- a/mod/quiz/renderer.php +++ b/mod/quiz/renderer.php @@ -114,7 +114,6 @@ class mod_quiz_renderer extends plugin_renderer_base { $this->page->requires->js_init_call('M.mod_quiz.init_review_form', null, false, quiz_get_js_module()); - // TODO fix this to use html_writer. $output = ''; $output .= html_writer::start_tag('form', array('action' => $attemptobj->review_url(0, $page, $showall), 'method' => 'post', 'class' => 'questionflagsaveform')); @@ -264,12 +263,13 @@ class mod_quiz_renderer extends plugin_renderer_base { } private function attempt_form($attemptobj, $page, $slots, $id, $nextpage) { - // Start the form - //TODO: Convert all html to html:writer $output = ''; //Start Form - $output .= html_writer::start_tag('form', array('action' => s($attemptobj->processattempt_url()), 'method' => 'post', 'enctype' => 'multipart/form-data', 'accept-charset' => 'utf-8', 'id' => 'responseform')); + $output .= html_writer::start_tag('form', + array('action' => s($attemptobj->processattempt_url()), 'method' => 'post', + 'enctype' => 'multipart/form-data', 'accept-charset' => 'utf-8', + 'id' => 'responseform')); $output .= html_writer::start_tag('div'); // Print all the questions @@ -279,22 +279,30 @@ class mod_quiz_renderer extends plugin_renderer_base { } $output .= html_writer::start_tag('div', array('class' => 'submitbtns')); - $output .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'next', 'value' => get_string('next'))); + $output .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'next', + 'value' => get_string('next'))); $output .= html_writer::end_tag('div'); // Some hidden fields to trach what is going on. - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'attempt', 'value' => $attemptobj->get_attemptid())); - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'thispage', 'value' => $page, 'id' => 'followingpage')); - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'nextpage', 'value' => $nextpage)); - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'timeup', 'value' => '0', 'id' => 'timeup')); - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey())); - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'scrollpos', 'value' => '', 'id' => 'scrollpos')); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'attempt', + 'value' => $attemptobj->get_attemptid())); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'thispage', + 'value' => $page, 'id' => 'followingpage')); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'nextpage', + 'value' => $nextpage)); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'timeup', + 'value' => '0', 'id' => 'timeup')); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', + 'value' => sesskey())); + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'scrollpos', + 'value' => '', 'id' => 'scrollpos')); // Add a hidden field with questionids. Do this at the end of the form, so // if you navigate before the form has finished loading, it does not wipe all // the student's answers. - $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'slots', 'value' => implode(',', $slots))); - + $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'slots', + 'value' => implode(',', $slots))); + //Finish form $output .= html_writer::end_tag('div'); $output .= html_writer::end_tag('form'); @@ -302,6 +310,87 @@ class mod_quiz_renderer extends plugin_renderer_base { return $output; } + /* + * Summary Page + */ + public function summary_page($attemptobj, $displayoptions) { + $output = ''; + $output .= $this->summary_table($attemptobj, $displayoptions); + $output .= $this->summary_container($attemptobj); + return $output; + } + + private function summary_table($attemptobj, $displayoptions) { + // Prepare the summary table header + $table = new html_table(); + $table->attributes['class'] = 'generaltable quizsummaryofattempt boxaligncenter'; + $table->head = array(get_string('question', 'quiz'), get_string('status', 'quiz')); + $table->align = array('left', 'left'); + $table->size = array('', ''); + $markscolumn = $displayoptions->marks >= question_display_options::MARK_AND_MAX; + if ($markscolumn) { + $table->head[] = get_string('marks', 'quiz'); + $table->align[] = 'left'; + $table->size[] = ''; + } + $table->data = array(); + + // Get the summary info for each question. + $slots = $attemptobj->get_slots(); + foreach ($slots as $slot) { + if (!$attemptobj->is_real_question($slot)) { + continue; + } + $flag = ''; + if ($attemptobj->is_question_flagged($slot)) { + $flag = html_writer::empty_tag('img', array('src' => $this->pix_url('i/flagged'), + 'alt' => get_string('flagged', 'question'), 'class' => 'questionflag')); + } + $row = array(html_writer::start_tag('a', + array('href' => $attemptobj->attempt_url($slot))). + $attemptobj->get_question_number($slot).$flag.html_writer::end_tag('a'), + $displayoptions->correctness); + if ($markscolumn) { + $row[] = $attemptobj->get_question_mark($slot); + } + $table->data[] = $row; + } + + // Print the summary table. + $output = html_writer::table($table); + + return $output; + } + + private function summary_container($attemptobj) { + $output = ''; + // countdown timer + $output .= $attemptobj->get_timer_html(); + + // Finish attempt button. + $output .= $this->container_start('submitbtns mdl-align'); + $options = array( + 'attempt' => $attemptobj->get_attemptid(), + 'finishattempt' => 1, + 'timeup' => 0, + 'slots' => '', + 'sesskey' => sesskey(), + ); + + $button = new single_button( + new moodle_url($attemptobj->processattempt_url(), $options), + get_string('submitallandfinish', 'quiz')); + $button->id = 'responseform'; + $button->add_confirm_action(get_string('confirmclose', 'quiz')); + + $output .= $this->container_start('controls'); + $output .= $this->render($button); + $output .= $this->container_end(); + $output .= $this->container_end(); + + return $output; + } + /** * Print each message in an array, surrounded by <p>, </p> tags. * diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index b479f1ba371..eab2ba2bbb1 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -99,66 +99,7 @@ if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { echo $OUTPUT->heading(format_string($attemptobj->get_quiz_name())); echo $OUTPUT->heading($title, 3); -// Prepare the summary table header -$table = new html_table(); -$table->attributes['class'] = 'generaltable quizsummaryofattempt boxaligncenter'; -$table->head = array(get_string('question', 'quiz'), get_string('status', 'quiz')); -$table->align = array('left', 'left'); -$table->size = array('', ''); -$markscolumn = $displayoptions->marks >= question_display_options::MARK_AND_MAX; -if ($markscolumn) { - $table->head[] = get_string('marks', 'quiz'); - $table->align[] = 'left'; - $table->size[] = ''; -} -$table->data = array(); - -// Get the summary info for each question. -$slots = $attemptobj->get_slots(); -foreach ($slots as $slot) { - if (!$attemptobj->is_real_question($slot)) { - continue; - } - $flag = ''; - if ($attemptobj->is_question_flagged($slot)) { - $flag = ' ' . - get_string('flagged', 'question') . ''; - } - $row = array('' . - $attemptobj->get_question_number($slot) . $flag . '', - $attemptobj->get_question_status($slot, $displayoptions->correctness)); - if ($markscolumn) { - $row[] = $attemptobj->get_question_mark($slot); - } - $table->data[] = $row; -} - -// Print the summary table. -echo html_writer::table($table); - -// countdown timer -echo $attemptobj->get_timer_html(); - -// Finish attempt button. -echo $OUTPUT->container_start('submitbtns mdl-align'); -$options = array( - 'attempt' => $attemptobj->get_attemptid(), - 'finishattempt' => 1, - 'timeup' => 0, - 'slots' => '', - 'sesskey' => sesskey(), -); - -$button = new single_button( - new moodle_url($attemptobj->processattempt_url(), $options), - get_string('submitallandfinish', 'quiz')); -$button->id = 'responseform'; -$button->add_confirm_action(get_string('confirmclose', 'quiz')); - -echo $OUTPUT->container_start('controls'); -echo $OUTPUT->render($button); -echo $OUTPUT->container_end(); -echo $OUTPUT->container_end(); +$output->summary_page($attemptobj, $displayoptions); // Finish the page $accessmanager->show_attempt_timer_if_needed($attemptobj->get_attempt(), time());