L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

random questions: MDL-17160 Adding random questions, maximum option.

Browse Source 
When counting how many options to put in the add NN random questions dropdown, we should only count questions of types that are usable by random.
This commit is contained in:
tjhunt
2008-11-07 05:50:08 +00:00
parent 11a786d55e
commit e87035545b
2 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/edit.php
+18 -13
View File
@@ -65,22 +65,27 @@
* Callback function called from question_list() function (which is called from showbank())
*/
function module_specific_controls($totalnumber, $recurse, $category, $cmid){
global $QTYPES;
$out = '';
$catcontext = get_context_instance_by_id($category->contextid);
if (has_capability('moodle/question:useall', $catcontext)){
for ($i = 1;$i <= min(10, $totalnumber); $i++) {
$randomcount[$i] = $i;
$randomusablequestions = $QTYPES['random']->get_usable_questions_from_category(
$category->id, $recurse, '0');
$maxrand = count($randomusablequestions);
if ($maxrand > 0) {
for ($i = 1;$i <= min(10, $maxrand); $i++) {
$randomcount[$i] = $i;
}
for ($i = 20;$i <= min(100, $maxrand); $i += 10) {
$randomcount[$i] = $i;
}
$out .= '<br />';
$out .= get_string('addrandom', 'quiz', choose_from_menu($randomcount, 'randomcount', '1', '', '', '', true));
$out .= '<input type="hidden" name="recurse" value="'.$recurse.'" />';
$out .= '<input type="hidden" name="categoryid" value="'.$category->id.'" />';
$out .= ' <input type="submit" name="addrandom" value="'. get_string('add') .'" />';
$out .= helpbutton('random', get_string('random', 'quiz'), 'quiz', true, false, '', true);
}
for ($i = 20;$i <= min(100, $totalnumber); $i += 10) {
$randomcount[$i] = $i;
}
$out = '<br />';
$out .= get_string('addrandom', 'quiz', choose_from_menu($randomcount, 'randomcount', '1', '', '', '', true));
$out .= '<input type="hidden" name="recurse" value="'.$recurse.'" />';
$out .= "<input type=\"hidden\" name=\"categoryid\" value=\"$category->id\" />";
$out .= ' <input type="submit" name="addrandom" value="'. get_string('add') .'" />';
$out .= helpbutton('random', get_string('random', 'quiz'), 'quiz', true, false, '', true);
} else {
$out = '';
}
return $out;
}
question/type/random/questiontype.php
+30 -22
View File
@@ -71,8 +71,34 @@ class random_qtype extends default_questiontype {
$question->id) ? true : false);
}
function create_session_and_responses(&$question, &$state, $cmoptions, $attempt) {
/**
* Get all the usable questions from a particular question category.
*
* @param integer $categoryid the id of a question category.
* @param boolean whether to include questions from subcategories.
* @param string $questionsinuse comma-separated list of question ids to exclude from consideration.
* @return array of question records.
*/
function get_usable_questions_from_category($categoryid, $subcategories, $questionsinuse) {
global $QTYPE_EXCLUDE_FROM_RANDOM;
if ($subcategories) {
$categorylist = question_categorylist($categoryid);
} else {
$categorylist = $categoryid;
}
if (!$catrandoms = get_records_select('question',
"category IN ($categorylist)
AND parent = '0'
AND hidden = '0'
AND id NOT IN ($questionsinuse)
AND qtype NOT IN ($QTYPE_EXCLUDE_FROM_RANDOM)", '', 'id')) {
$catrandoms = array();
}
return $catrandoms;
}
function create_session_and_responses(&$question, &$state, $cmoptions, $attempt) {
global $QTYPES;
// Choose a random question from the category:
// We need to make sure that no question is used more than once in the
// quiz. Therfore the following need to be excluded:
@@ -85,26 +111,9 @@ class random_qtype extends default_questiontype {
}
if (!isset($this->catrandoms[$question->category][$question->questiontext])) {
// Need to fetch random questions from category $question->category"
// (Note: $this refers to the questiontype, not the question.)
global $CFG;
if ($question->questiontext == "1") {
// recurse into subcategories
$categorylist = question_categorylist($question->category);
} else {
$categorylist = $question->category;
}
if ($catrandoms = get_records_select('question',
"category IN ($categorylist)
AND parent = '0'
AND hidden = '0'
AND id NOT IN ($cmoptions->questionsinuse)
AND qtype NOT IN ($QTYPE_EXCLUDE_FROM_RANDOM)", '', 'id')) {
$this->catrandoms[$question->category][$question->questiontext] =
draw_rand_array($catrandoms, count($catrandoms));
} else {
$this->catrandoms[$question->category][$question->questiontext] = array();
}
$this->catrandoms[$question->category][$question->questiontext] =
$this->get_usable_questions_from_category($question->category,
$question->questiontext == "1", $cmoptions->questionsinuse);
}
while ($wrappedquestion =
@@ -113,7 +122,6 @@ class random_qtype extends default_questiontype {
/// $randomquestion is not in use and will therefore be used
/// as the randomquestion here...
$wrappedquestion = get_record('question', 'id', $wrappedquestion->id);
global $QTYPES;
$QTYPES[$wrappedquestion->qtype]
->get_question_options($wrappedquestion);
$QTYPES[$wrappedquestion->qtype]