MDL-20636 changes made to renderers, attempt and view

rudivdme · May 9, 2011 · 13040e1 · 13040e1
1 parent 63be47d
commit 13040e1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
@@ -79,7 +79,7 @@
 $output = $PAGE->get_renderer('mod_quiz');
 if (!$attemptobj->is_preview_user() && $messages) {
     print_error('attempterror', 'quiz', $attemptobj->view_url(),
-            $output->print_messages($messages));
+            $output->access_messages($messages));
 }
 $accessmanager->do_password_check($attemptobj->is_preview_user());
 

diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
@@ -267,7 +267,7 @@ private function attempt_form($attemptobj, $page, $slots, $id, $nextpage) {
 
         //Start Form
         $output .= html_writer::start_tag('form',
-                array('action' => s($attemptobj->processattempt_url()), 'method' => 'post',
+                array('action' => $attemptobj->processattempt_url(), 'method' => 'post',
                 'enctype' => 'multipart/form-data', 'accept-charset' => 'utf-8',
                 'id' => 'responseform'));
         $output .= html_writer::start_tag('div');
@@ -309,14 +309,31 @@ private function attempt_form($attemptobj, $page, $slots, $id, $nextpage) {
 
         return $output;
     }
+
+    /**
+     * Print each message in an array, surrounded by &lt;p>, &lt;/p> tags.
+     *
+     * @param array $messages the array of message strings.
+     * @param bool $return if true, return a string, instead of outputting.
+     *
+     * @return mixed, if $return is true, return the string that would have been output, otherwise
+     * return null.
+     */
+    public function access_messages($messages) {
+        $output = '';
+        foreach ($messages as $message) {
+            $output .= html_writer::tag('p', $message) . "\n";
+        }
+        return $output;
+    }
 
     /*
      * Summary Page
      */
     public function summary_page($attemptobj, $displayoptions) {
         $output = '';
         $output .= $this->summary_table($attemptobj, $displayoptions);
-        $output .= $this->summary_container($attemptobj);
+        $output .= $this->summary_page_controls($attemptobj);
         return $output;
     }
 
@@ -362,10 +379,10 @@ private function summary_table($attemptobj, $displayoptions) {
         return $output;
     }
 
-    private function summary_container($attemptobj) {
+    private function summary_page_controls($attemptobj) {
         $output = '';
         // countdown timer
-        $output .= $attemptobj->get_timer_html();
+        $output .= $this->summary_get_timer($attemptobj);
 
         // Finish attempt button.
         $output .= $this->container_start('submitbtns mdl-align');
@@ -390,22 +407,9 @@ private function summary_container($attemptobj) {
 
         return $output;
     }
-
-    /**
-     * Print each message in an array, surrounded by &lt;p>, &lt;/p> tags.
-     *
-     * @param array $messages the array of message strings.
-     * @param bool $return if true, return a string, instead of outputting.
-     *
-     * @return mixed, if $return is true, return the string that would have been output, otherwise
-     * return null.
-     */
-    public function print_messages($messages) {
-        $output = '';
-        foreach ($messages as $message) {
-            $output .= html_writer::tag('p', $message) . "\n";
-        }
-        return $output;
+
+    private function summary_get_timer($attemptobj){
+        return $attemptobj->get_timer_html();
     }
 }
 

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
@@ -101,7 +101,7 @@
             quiz_get_grading_option_name($quiz->grademethod));
 }
 echo $OUTPUT->box_start('quizinfo');
-$output->print_messages($messages);
+$output->access_messages($messages);
 echo $OUTPUT->box_end();
 
 // Show number of attempts summary to those who can view reports.
@@ -368,7 +368,7 @@
         if ($canattempt) {
             $messages = $accessmanager->prevent_new_attempt($numattempts, $lastfinishedattempt);
             if ($messages) {
-                $output->print_messages($messages);
+                $output->access_messages($messages);
             } else if ($numattempts == 0) {
                 $buttontext = get_string('attemptquiznow', 'quiz');
             } else {
@@ -386,7 +386,7 @@
         if (!$moreattempts) {
             $buttontext = '';
         } else if ($canattempt && $messages = $accessmanager->prevent_access()) {
-            $output->print_messages($messages);
+            $output->access_messages($messages);
             $buttontext = '';
         }
     }