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

Merge branch 'MDL-43833' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-05-19 20:11:50 +08:00
commit cc3dfc2c5f
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mod/quiz/report/attemptsreport_options.php
View file

@ -119,6 +119,11 @@ class mod_quiz_attempts_report_options {
'attempts' => $this->attempts, 'attempts' => $this->attempts,
'onlygraded' => $this->onlygraded, 'onlygraded' => $this->onlygraded,
); );
if ($this->states) {
$params['states'] = implode('-', $this->states);
}
if (groups_get_activity_groupmode($this->cm, $this->course)) { if (groups_get_activity_groupmode($this->cm, $this->course)) {
$params['group'] = $this->group; $params['group'] = $this->group;
} }
@ -164,6 +169,12 @@ class mod_quiz_attempts_report_options {
$toform->onlygraded = $this->onlygraded; $toform->onlygraded = $this->onlygraded;
$toform->pagesize = $this->pagesize; $toform->pagesize = $this->pagesize;
if ($this->states) {
foreach (self::$statefields as $field => $state) {
$toform->$field = in_array($state, $this->states);
}
}
return $toform; return $toform;
} }
@ -186,7 +197,7 @@ class mod_quiz_attempts_report_options {
} }
/** /**
* Set the fields of this object from the user's preferences. * Set the fields of this object from the URL parameters.
*/ */
public function setup_from_params() { public function setup_from_params() {
$this->attempts = optional_param('attempts', $this->attempts, PARAM_ALPHAEXT); $this->attempts = optional_param('attempts', $this->attempts, PARAM_ALPHAEXT);
@ -194,8 +205,10 @@ class mod_quiz_attempts_report_options {
$this->onlygraded = optional_param('onlygraded', $this->onlygraded, PARAM_BOOL); $this->onlygraded = optional_param('onlygraded', $this->onlygraded, PARAM_BOOL);
$this->pagesize = optional_param('pagesize', $this->pagesize, PARAM_INT); $this->pagesize = optional_param('pagesize', $this->pagesize, PARAM_INT);
$this->states = explode('-', optional_param('states', $states = optional_param('states', '', PARAM_ALPHAEXT);
implode('-', $this->states), PARAM_ALPHAEXT)); if (!empty($states)) {
$this->states = explode('-', $states);
}
$this->download = optional_param('download', $this->download, PARAM_ALPHA); $this->download = optional_param('download', $this->download, PARAM_ALPHA);
} }