mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 13:38:32 +01:00
Code Issues Projects Releases Wiki Activity

MDL-80192 reportbuilder: ensure filter form group elements have labels.

Browse Source 
This ensures compliance with the following WCAG criterion:

"H71: Providing a description for groups of form controls using fieldset
and legend elements".
This commit is contained in:
Paul Holden 2023-11-20 17:31:07 +00:00
parent 9357a1c583
commit 6576b1f9ba
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
10 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/classes/reportbuilder/local/filters/courserole.php
View File

@ -55,7 +55,8 @@ class courserole extends base {
$elements['course'] = $mform->createElement('text', "{$this->name}_course", get_string('shortnamecourse'));
$mform->setType("{$this->name}_course", PARAM_RAW_TRIMMED);
$mform->addElement('group', "{$this->name}_group", '', $elements, '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

1
lang/en/form.php
View File

@ -50,6 +50,7 @@ $string['filetypesnotall'] = 'It is not allowed to select \'All file types\' her
$string['filetypesnotallowed'] = 'These file types are not allowed here: {$a}';
$string['filetypesothers'] = 'Other files';
$string['filetypesunknown'] = 'Unknown file types: {$a}';
$string['formactions'] = 'Form actions';
$string['general'] = 'General';
$string['hideadvanced'] = 'Hide advanced';
$string['hour'] = 'Hour';

5
reportbuilder/classes/form/condition.php
View File

@ -146,9 +146,10 @@ class condition extends dynamic_form {
$buttons = [];
$buttons[] = $mform->createElement('submit', 'submitbutton', get_string('apply', 'core_reportbuilder'));
$buttons[] = $mform->createElement('submit', 'resetconditions', get_string('resetall', 'core_reportbuilder'),
null, null, ['customclassoverride' => 'btn-link']);
null, null, ['customclassoverride' => 'btn-link ml-1']);
$mform->addGroup($buttons, 'buttonar', '', [' '], false);
$mform->addGroup($buttons, 'buttonar', get_string('formactions', 'core_form'), '', false)
->setHiddenLabel(true);
$mform->closeHeaderBefore('buttonar');
$mform->disable_form_change_checker();

5
reportbuilder/classes/form/filter.php
View File

@ -149,9 +149,10 @@ class filter extends dynamic_form {
$buttons = [];
$buttons[] = $mform->createElement('submit', 'submitbutton', get_string('apply', 'core_reportbuilder'));
$buttons[] = $mform->createElement('submit', 'resetfilters', get_string('resetall', 'core_reportbuilder'),
null, null, ['customclassoverride' => 'btn-link']);
null, null, ['customclassoverride' => 'btn-link ml-1']);
$mform->addGroup($buttons, 'buttonar', '', [' '], false);
$mform->addGroup($buttons, 'buttonar', get_string('formactions', 'core_form'), '', false)
->setHiddenLabel(true);
$mform->closeHeaderBefore('buttonar');
$mform->disable_form_change_checker();

3
reportbuilder/classes/local/filters/date.php
View File

@ -143,7 +143,8 @@ class date extends base {
$mform->hideIf("{$this->name}_unit", "{$this->name}_operator", 'in', $typesnounit);
// Add operator/value/unit group.
$mform->addGroup($elements, "{$this->name}_group", '', '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
// Date selectors for range operator.
$mform->addElement('date_selector', "{$this->name}_from", get_string('filterdatefrom', 'core_reportbuilder'),

3
reportbuilder/classes/local/filters/duration.php
View File

@ -96,7 +96,8 @@ class duration extends base {
$mform->setDefault("{$this->name}_unit", 1);
$mform->hideIf("{$this->name}_unit", "{$this->name}_operator", 'eq', self::DURATION_ANY);
$mform->addGroup($elements, "{$this->name}_group", '', '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

3
reportbuilder/classes/local/filters/filesize.php
View File

@ -100,7 +100,8 @@ class filesize extends base {
$mform->setDefault("{$this->name}_unit", self::SIZE_UNIT_BYTE);
$mform->hideIf("{$this->name}_unit", "{$this->name}_operator", 'eq', self::ANY_VALUE);
$mform->addElement('group', "{$this->name}_group", '', $elements, '', false);
$mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

10
reportbuilder/classes/local/filters/number.php
View File

@ -93,16 +93,16 @@ class number extends base {
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()), ['size' => 3]);
$mform->setType($this->name . '_value1', PARAM_INT);
$mform->setDefault($this->name . '_value1', 0);
$mform->hideIf($this->name . '_value1', $this->name . '_operator', 'in',
[self::ANY_VALUE, self::IS_NOT_EMPTY, self::IS_EMPTY]);
$objs['text2'] = $mform->createElement('text', $this->name . '_value2', get_string('to'), ['size' => 3]);
$mform->setType($this->name . '_value2', PARAM_INT);
$mform->setDefault($this->name . '_value2', 0);
$mform->addElement('group', $this->name . '_grp', '', $objs, '', false);
$mform->hideIf($this->name . '_value1', $this->name . '_operator', 'in',
[self::ANY_VALUE, self::IS_NOT_EMPTY, self::IS_EMPTY]);
$mform->hideIf($this->name . '_value2', $this->name . '_operator', 'noteq', self::RANGE);
$mform->addGroup($objs, $this->name . '_grp', $this->get_header(), '', false)
->setHiddenLabel(true);
}
/**

3
reportbuilder/classes/local/filters/select.php
View File

@ -84,7 +84,8 @@ class select extends base {
$elements['value'] = $mform->createElement($element, $this->name . '_value',
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()), $options);
$mform->addElement('group', $this->name . '_group', '', $elements, '', false);
$mform->addGroup($elements, $this->name . '_group', $this->get_header(), '', false)
->setHiddenLabel(true);
$mform->hideIf($this->name . '_value', $this->name . '_operator', 'eq', self::ANY_VALUE);
}

3
reportbuilder/classes/local/filters/text.php
View File

@ -92,7 +92,8 @@ class text extends base {
$elements['value'] = $mform->createElement('text', $this->name . '_value',
get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()));
$mform->addElement('group', $this->name . '_group', '', $elements, '', false);
$mform->addGroup($elements, $this->name . '_group', $this->get_header(), '', false)
->setHiddenLabel(true);
$mform->setType($this->name . '_value', PARAM_RAW_TRIMMED);
$mform->hideIf($this->name . '_value', $this->name . '_operator', 'eq', self::ANY_VALUE);