mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39606-master-int' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2013-05-13 13:43:07 +08:00
commit 509c81cf07
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
question/type/calculated/datasetitems_form.php
View File

@ -183,6 +183,7 @@ class question_dataset_dependent_items_form extends question_wizard_form {
$answer->answer);
$mform->addElement('text', 'tolerance['.$key.']',
get_string('tolerance', 'qtype_calculated'));
$mform->setType('tolerance['.$key.']', PARAM_RAW);
$mform->setAdvanced('tolerance['.$key.']', true);
$mform->addElement('select', 'tolerancetype['.$key.']',
get_string('tolerancetype', 'qtype_numerical'),

14
question/type/numerical/edit_numerical_form.php
View File

@ -145,10 +145,11 @@ class qtype_numerical_edit_form extends question_edit_form {
$unitfields = array($mform->createElement('group', 'units',
get_string('unitx', 'qtype_numerical'), $this->unit_group($mform), null, false));
$repeatedoptions['unit']['disabledif'] =
array('unitrole', 'eq', qtype_numerical::UNITNONE);
$repeatedoptions['multiplier']['disabledif'] =
array('unitrole', 'eq', qtype_numerical::UNITNONE);
$repeatedoptions['unit']['disabledif'] = array('unitrole', 'eq', qtype_numerical::UNITNONE);
$repeatedoptions['unit']['type'] = PARAM_NOTAGS;
$repeatedoptions['multiplier']['disabledif'] = array('unitrole', 'eq', qtype_numerical::UNITNONE);
$repeatedoptions['multiplier']['type'] = PARAM_NUMBER;
$mform->disabledIf('addunits', 'unitrole', 'eq', qtype_numerical::UNITNONE);
if (isset($this->question->options->units)) {
@ -184,12 +185,11 @@ class qtype_numerical_edit_form extends question_edit_form {
*/
protected function unit_group($mform) {
$grouparray = array();
$grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'),
array('type'=>PARAM_NOTAGS, 'size'=>10));
$grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'), array('size'=>10));
$grouparray[] = $mform->createElement('static', '', '', ' ' .
get_string('multiplier', 'quiz').' ');
$grouparray[] = $mform->createElement('text', 'multiplier',
get_string('multiplier', 'quiz'), array('type'=>PARAM_NUMBER, 'size'=>10));
get_string('multiplier', 'quiz'), array('size'=>10));
return $grouparray;
}