moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-15539 - Rework review.php to use attemptlib.php - the bulk of the conversion.

Browse source
This commit is contained in:
tjhunt 2008-07-08 17:47:57 +00:00
parent 1aab356193
commit 4fc3d7e549
2 changed files with 78 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mod/quiz/attemptlib.php
View file

@ -38,7 +38,6 @@ class quiz {
// Fields set later if that data is needed.
protected $questions = null;
protected $accessmanager = null;
protected $reviewoptions = null;
protected $ispreviewuser = null;
// Constructor =========================================================================
@ -366,6 +365,7 @@ class quiz_attempt extends quiz {
// Fields set later if that data is needed.
protected $states = array();
protected $reviewoptions = null;
// Constructor =========================================================================
/**
@ -439,6 +439,11 @@ class quiz_attempt extends quiz {
return $this->attempt->timefinish != 0;
}
/** @return boolean whether this attemp is a preview attempt. */
public function is_preview() {
return $this->attempt->preview;
}
public function get_question_state($questionid) {
$this->ensure_state_loaded($questionid);
return $this->states[$questionid];
@ -447,7 +452,7 @@ class quiz_attempt extends quiz {
/**
* Wrapper that calls quiz_get_reviewoptions with the appropriate arguments.
*
* @return object the review optoins for this user on this attempt.
* @return object the review options for this user on this attempt.
*/
public function get_review_options() {
if (is_null($this->reviewoptions)) {
@ -456,6 +461,15 @@ class quiz_attempt extends quiz {
return $this->reviewoptions;
}
/**
* Wrapper that calls get_render_options with the appropriate arguments.
*
* @return object the render options for this user on this attempt.
*/
public function get_render_options($state) {
return quiz_get_renderoptions($this->quiz->review, $state);
}
/**
* Get a quiz_attempt_question_iterator for either a page of the quiz, or a whole quiz.
* You must have called load_questions with an appropriate argument first.
@ -555,9 +569,12 @@ class quiz_attempt extends quiz {
* and $page will be ignored.
* @return string the URL to review this attempt.
*/
public function review_url($questionid = 0, $page = -1, $showall = false) {
public function review_url($questionid = 0, $page = -1, $showall = false, $otherattemptid = null) {
global $CFG;
return $CFG->wwwroot . '/mod/quiz/review.php?attempt=' . $this->attempt->id . '&' .
if (is_null($otherattemptid)) {
$otherattemptid = $this->attempt->id;
}
return $CFG->wwwroot . '/mod/quiz/review.php?attempt=' . $otherattemptid . '&' .
$this->page_and_question_fragment($questionid, $page, $showall);
}
@ -576,7 +593,11 @@ class quiz_attempt extends quiz {
}
public function print_question($id) {
$options = quiz_get_renderoptions($this->quiz->review, $this->states[$id]);
if ($this->is_finished()) {
$options = $this->get_review_options();
} else {
$options = $this->get_render_options($this->states[$id]);
}
print_question($this->questions[$id], $this->states[$id], $this->questions[$id]->_number,
$this->quiz, $options);
}