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

MDL-19820 Upgraded calls to choose_from_menu

Browse Source
This commit is contained in:
nicolasconnault
2009-08-18 00:13:28 +00:00
parent 30721aaf6b
commit 44c64ad857
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/calculated/questiontype.php
+14 -12
View File
@@ -779,6 +779,7 @@ class question_calculated_qtype extends default_questiontype {
}
function custom_generator_tools($datasetdef) {
global $OUTPUT;
if (preg_match('~^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$~',
$datasetdef->options, $regs)) {
$defid = "$datasetdef->type-$datasetdef->category-$datasetdef->name";
@@ -787,20 +788,22 @@ class question_calculated_qtype extends default_questiontype {
? 'decimals'
: 'significantfigures'), 'quiz', $i);
}
$select1 = html_select::make($lengthoptions, 'calclength[]', $regs[4], false);
$select1->nothingvalue = '';
$menu1 = $OUTPUT->select($select1);
$select2 = html_select::make(array('uniform' => get_string('uniform', 'quiz'),
'loguniform' => get_string('loguniform', 'quiz')), 'calcdistribution[]', $regs[1], false);
$select2->nothingvalue = '';
$menu2 = $OUTPUT->select($select2);
return '<input type="submit" onclick="'
. "getElementById('addform').regenerateddefid.value='$defid'; return true;"
.'" value="'. get_string('generatevalue', 'quiz') . '"/><br/>'
. '<input type="text" size="3" name="calcmin[]" '
. " value=\"$regs[2]\"/> &amp; <input name=\"calcmax[]\" "
. ' type="text" size="3" value="' . $regs[3] .'"/> '
. choose_from_menu($lengthoptions, 'calclength[]',
$regs[4], // Selected
'', '', '', true) . '<br/>'
. choose_from_menu(array('uniform' => get_string('uniform', 'quiz'),
'loguniform' => get_string('loguniform', 'quiz')),
'calcdistribution[]',
$regs[1], // Selected
'', '', '', true);
. $menu1 . '<br/>'
. $menu2;
} else {
return '';
}
@@ -1138,22 +1141,21 @@ class question_calculated_qtype extends default_questiontype {
function construct_dataset_menus($form, $mandatorydatasets,
$optionaldatasets) {
global $OUTPUT;
$datasetmenus = array();
foreach ($mandatorydatasets as $datasetname) {
if (!isset($datasetmenus[$datasetname])) {
list($options, $selected) =
$this->dataset_options($form, $datasetname);
unset($options['0']); // Mandatory...
$datasetmenus[$datasetname] = choose_from_menu ($options,
'dataset[]', $selected, '', '', "0", true);
$datasetmenus[$datasetname] = $OUTPUT->select(html_select::make($options, 'dataset[]', $selected, false));
}
}
foreach ($optionaldatasets as $datasetname) {
if (!isset($datasetmenus[$datasetname])) {
list($options, $selected) =
$this->dataset_options($form, $datasetname);
$datasetmenus[$datasetname] = choose_from_menu ($options,
'dataset[]', $selected, '', '', "0", true);
$datasetmenus[$datasetname] = $OUTPUT->select(html_select::make($options, 'dataset[]', $selected, false));
}
}
return $datasetmenus;
question/type/match/questiontype.php
+5 -4
View File
@@ -227,7 +227,7 @@ class question_match_qtype extends default_questiontype {
}
function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) {
global $CFG;
global $CFG, $OUTPUT;
$subquestions = $state->options->subquestions;
$correctanswers = $this->get_correct_responses($question, $state);
$nameprefix = $question->name_prefix;
@@ -294,9 +294,10 @@ class question_match_qtype extends default_questiontype {
$a->feedbackimg = question_get_feedback_image($correctresponse);
}
}
$a->control = choose_from_menu($answers, $menuname, $response, 'choose',
'', 0, true, $options->readonly);
$select = html_select::make($answers, $menuname, $response);
$select->disabled = $options->readonly;
$a->control = $OUTPUT->select($select);
// Neither the editing interface or the database allow to provide
// fedback for this question type.