mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 21:45:37 +02:00
Code Issues Projects Releases Wiki Activity

MDL-53140 qtype_calculated: Add support for locale-aware decimal points

Browse Source
This commit is contained in:
Shamim Rezaie 2019-02-07 03:05:26 +11:00
parent 326bb5474a
commit 75dc90370a
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,8 +146,7 @@ class question_dataset_dependent_items_form extends question_wizard_form {
} else {
$name = get_string('wildcard', 'qtype_calculated', $datasetdef->name);
}
$mform->addElement('text', "number[{$j}]", $name);
$mform->setType("number[{$j}]", PARAM_RAW); // This parameter will be validated in validation().
$mform->addElement('float', "number[{$j}]", $name);
$this->qtypeobj->custom_generator_tools_part($mform, $idx, $j);
$idx++;
$mform->addElement('hidden', "definition[{$j}]");
@ -174,7 +173,7 @@ class question_dataset_dependent_items_form extends question_wizard_form {
$mform->addElement('static',
'answercomment[' . ($this->noofitems+$key1) . ']', $ans);
$mform->addElement('hidden', 'tolerance['.$key.']', '');
$mform->setType('tolerance['.$key.']', PARAM_RAW);
$mform->setType('tolerance['.$key.']', PARAM_FLOAT); // No need to worry about localisation, as the value of this field will not be shown to users anymore.
$mform->setAdvanced('tolerance['.$key.']', true);
$mform->addElement('hidden', 'tolerancetype['.$key.']', '');
$mform->setType('tolerancetype['.$key.']', PARAM_RAW);
@ -188,9 +187,8 @@ class question_dataset_dependent_items_form extends question_wizard_form {
} else if ( $ans !== '' ) {
$mform->addElement('static', 'answercomment[' . ($this->noofitems+$key1) . ']',
$ans);
$mform->addElement('text', 'tolerance['.$key.']',
$mform->addElement('float', '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'),
@ -287,17 +285,17 @@ class question_dataset_dependent_items_form extends question_wizard_form {
foreach ($this->datasetdefs as $defkey => $datasetdef) {
if ($k > 0) {
if ($datasetdef->category == 0 ) {
$mform->addElement('text', "number[{$j}]",
$mform->addElement('float', "number[{$j}]",
get_string('wildcard', 'qtype_calculated', $datasetdef->name));
} else {
$mform->addElement('text', "number[{$j}]", get_string(
$mform->addElement('float', "number[{$j}]", get_string(
'sharedwildcard', 'qtype_calculated', $datasetdef->name));
}
} else {
$mform->addElement('hidden', "number[{$j}]" , '');
$mform->setType("number[{$j}]", PARAM_LOCALISEDFLOAT); // Localisation handling has to be done manually.
}
$mform->setType("number[{$j}]", PARAM_RAW); // This parameter will be validated in validation().
$mform->addElement('hidden', "itemid[{$j}]");
$mform->setType("itemid[{$j}]", PARAM_INT);
@ -408,7 +406,13 @@ class question_dataset_dependent_items_form extends question_wizard_form {
$data = array();
foreach ($this->datasetdefs as $defid => $datasetdef) {
if (isset($datasetdef->items[$itemnumber])) {
$formdata["number[{$j}]"] = $datasetdef->items[$itemnumber]->value;
$value = $datasetdef->items[$itemnumber]->value;
if ($this->_form->getElementType("number[{$j}]") == 'hidden') {
// Some of the number elements are from the float type and some are from the hidden type.
// We need to manually handle localised floats for hidden elements.
$value = format_float($value, strlen($value), true, true);
}
$formdata["number[{$j}]"] = $value;
$formdata["definition[{$j}]"] = $defid;
$formdata["itemid[{$j}]"] = $datasetdef->items[$itemnumber]->id;
$data[$datasetdef->name] = $datasetdef->items[$itemnumber]->value;
@ -438,11 +442,16 @@ class question_dataset_dependent_items_form extends question_wizard_form {
foreach ($this->datasetdefs as $defid => $datasetdef) {
if (!optional_param('updatedatasets', false, PARAM_BOOL) &&
!optional_param('updateanswers', false, PARAM_BOOL)) {
$formdata["number[{$j}]"] = $this->qtypeobj->generate_dataset_item(
$datasetdef->options);
$value = $this->qtypeobj->generate_dataset_item($datasetdef->options);
} else {
$formdata["number[{$j}]"] = $this->_form->getElementValue("number[{$j}]");
$value = $this->_form->getElementValue("number[{$j}]");
}
if ($this->_form->getElementType("number[{$j}]") == 'hidden') {
// Some of the number elements are from the float type and some are from the hidden type.
// We need to manually handle localised floats for hidden elements.
$value = format_float($value, strlen($value), true, true);
}
$formdata["number[{$j}]"] = $value;
$formdata["definition[{$j}]"] = $defid;
$formdata["itemid[{$j}]"] = isset($datasetdef->items[$itemnumber]) ?
$datasetdef->items[$itemnumber]->id : 0;
@ -455,7 +464,6 @@ class question_dataset_dependent_items_form extends question_wizard_form {
$j = $this->noofitems * count($this->datasetdefs) + 1;
if (!$this->regenerate && !optional_param('updatedatasets', false, PARAM_BOOL) &&
!optional_param('updateanswers', false, PARAM_BOOL)) {
$idx = 1;
$itemnumber = $this->noofitems + 1;
foreach ($this->datasetdefs as $defid => $datasetdef) {
if (isset($datasetdef->items[$itemnumber])) {

7
question/type/calculated/questiontype.php
View File

@ -730,14 +730,12 @@ class qtype_calculated extends question_type {
public function custom_generator_tools_part($mform, $idx, $j) {
$minmaxgrp = array();
$minmaxgrp[] = $mform->createElement('text', "calcmin[{$idx}]",
$minmaxgrp[] = $mform->createElement('float', "calcmin[{$idx}]",
get_string('calcmin', 'qtype_calculated'));
$minmaxgrp[] = $mform->createElement('text', "calcmax[{$idx}]",
$minmaxgrp[] = $mform->createElement('float', "calcmax[{$idx}]",
get_string('calcmax', 'qtype_calculated'));
$mform->addGroup($minmaxgrp, 'minmaxgrp',
get_string('minmax', 'qtype_calculated'), ' - ', false);
$mform->setType("calcmin[{$idx}]", PARAM_FLOAT);
$mform->setType("calcmax[{$idx}]", PARAM_FLOAT);
$precisionoptions = range(0, 10);
$mform->addElement('select', "calclength[{$idx}]",
@ -754,7 +752,6 @@ class qtype_calculated extends question_type {
foreach ($datasetdefs as $datasetdef) {
if (preg_match('~^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$~',
$datasetdef->options, $regs)) {
$defid = "{$datasetdef->type}-{$datasetdef->category}-{$datasetdef->name}";
$formdata["calcdistribution[{$idx}]"] = $regs[1];
$formdata["calcmin[{$idx}]"] = $regs[2];
$formdata["calcmax[{$idx}]"] = $regs[3];