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

Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2013-04-08 12:00:52 +08:00
parent bf48be3c7c 8971ddd5a9
commit a6c215ab1f
4 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/calculated/edit_calculated_form.php
+1
View File
@@ -130,6 +130,7 @@ class qtype_calculated_edit_form extends qtype_numerical_edit_form {
$mform->addElement('hidden', 'initialcategory', 1);
$mform->addElement('hidden', 'reload', 1);
$mform->setType('initialcategory', PARAM_INT);
$mform->setType('reload', PARAM_BOOL);
$html2 = $this->qtypeobj->print_dataset_definitions_category($this->question);
$mform->insertElementBefore(
$mform->createElement('static', 'listcategory', $label, $html2), 'name');
question/type/calculatedmulti/edit_calculatedmulti_form.php
+2
View File
@@ -86,6 +86,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form {
$repeated[] = $mform->createElement('hidden', 'tolerancetype', 1);
$repeatedoptions['tolerance']['type'] = PARAM_FLOAT;
$repeatedoptions['tolerance']['default'] = 0.01;
$repeatedoptions['tolerancetype']['type'] = PARAM_INT;
// Create display group.
$answerdisplay = array();
@@ -115,6 +116,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form {
$mform->addElement('hidden', 'initialcategory', 1);
$mform->addElement('hidden', 'reload', 1);
$mform->setType('initialcategory', PARAM_INT);
$mform->setType('reload', PARAM_BOOL);
$html2 = '';
$mform->insertElementBefore(
question/type/calculatedsimple/edit_calculatedsimple_form.php
+1
View File
@@ -292,6 +292,7 @@ class qtype_calculatedsimple_edit_form extends qtype_calculated_edit_form {
$label = get_string("sharedwildcards", "qtype_calculated");
$mform->addElement('hidden', 'synchronize', 0);
$mform->addElement('hidden', 'initialcategory', 1);
$mform->setType('synchronize', PARAM_BOOL);
$mform->setType('initialcategory', PARAM_INT);
$mform->addElement('hidden', 'reload', 1);
$mform->setType('reload', PARAM_INT);
question/type/truefalse/edit_truefalse_form.php
+1
View File
@@ -60,6 +60,7 @@ class qtype_truefalse_edit_form extends question_edit_form {
get_string('settingsformultipletries', 'question'));
$mform->addElement('hidden', 'penalty', 1);
$mform->setType('penalty', PARAM_FLOAT);
$mform->addElement('static', 'penaltymessage',
get_string('penaltyforeachincorrecttry', 'question'), 1);