mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-84628 report_log: Fix report filters layout after BS5 upgrade

Browse Source
This commit is contained in:
Mikel Martín 2025-02-24 13:27:27 +01:00
parent 7a318d5c85
commit eda3d16912
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
report/log/classes/renderer.php
View File

@ -87,7 +87,7 @@ class report_log_renderer extends plugin_renderer_base {
*/
public function report_selector_form(report_log_renderable $reportlog) {
echo html_writer::start_tag('form', array('class' => 'logselecform', 'action' => $reportlog->url, 'method' => 'get'));
echo html_writer::start_div();
echo html_writer::start_div('d-flex flex-wrap align-items-center gap-2');
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'chooselog', 'value' => '1'));
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'showusers', 'value' => $reportlog->showusers));
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'showcourses',
@ -101,8 +101,7 @@ class report_log_renderer extends plugin_renderer_base {
$groups = $reportlog->get_group_list();
if (!empty($groups)) {
echo html_writer::label(get_string('selectagroup'), 'menugroup', false, array('class' => 'accesshide'));
echo html_writer::select($groups, "group", $reportlog->groupid, get_string("allgroups"),
['class' => 'me-2 mb-2']);
echo html_writer::select($groups, "group", $reportlog->groupid, get_string("allgroups"));
}
// Add user selector.
@ -110,8 +109,7 @@ class report_log_renderer extends plugin_renderer_base {
if ($reportlog->showusers) {
echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide'));
echo html_writer::select($users, "user", $reportlog->userid, get_string("allparticipants"),
['class' => 'me-2 mb-2']);
echo html_writer::select($users, "user", $reportlog->userid, get_string("allparticipants"));
} else {
$users = array();
if (!empty($reportlog->userid)) {
@ -120,7 +118,7 @@ class report_log_renderer extends plugin_renderer_base {
$users[0] = get_string('allparticipants');
}
echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide'));
echo html_writer::select($users, "user", $reportlog->userid, false, ['class' => 'me-2 mb-2']);
echo html_writer::select($users, "user", $reportlog->userid, false);
$a = new stdClass();
$a->url = new moodle_url('/report/log/index.php', array('chooselog' => 0,
'group' => $reportlog->get_selected_group(), 'user' => $reportlog->userid,
@ -135,8 +133,7 @@ class report_log_renderer extends plugin_renderer_base {
// Add date selector.
$dates = $reportlog->get_date_options();
echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide'));
echo html_writer::select($dates, "date", $reportlog->date, get_string("alldays"),
['class' => 'me-2 mb-2']);
echo html_writer::select($dates, "date", $reportlog->date, get_string("alldays"));
// Add activity selector.
echo $this->get_activity_selector_field($reportlog);
@ -144,18 +141,17 @@ class report_log_renderer extends plugin_renderer_base {
// Add actions selector.
echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide'));
echo html_writer::select($reportlog->get_actions(), 'modaction', $reportlog->action,
get_string("allactions"), ['class' => 'me-2 mb-2']);
get_string("allactions"));
// Add origin.
$origin = $reportlog->get_origin_options();
echo html_writer::label(get_string('origin', 'report_log'), 'menuorigin', false, array('class' => 'accesshide'));
echo html_writer::select($origin, 'origin', $reportlog->origin, false, ['class' => 'me-2 mb-2']);
echo html_writer::select($origin, 'origin', $reportlog->origin, false);
// Add edulevel.
$edulevel = $reportlog->get_edulevel_options();
echo html_writer::label(get_string('edulevel'), 'menuedulevel', false, array('class' => 'accesshide'));
echo html_writer::select($edulevel, 'edulevel', $reportlog->edulevel, false,
['class' => 'me-2 mb-2']) .$this->help_icon('edulevel');
echo html_writer::select($edulevel, 'edulevel', $reportlog->edulevel, false) .$this->help_icon('edulevel');
// Add reader option.
// If there is some reader available then only show submit button.
@ -167,15 +163,14 @@ class report_log_renderer extends plugin_renderer_base {
} else {
echo html_writer::label(get_string('selectlogreader', 'report_log'), 'menureader', false,
array('class' => 'accesshide'));
echo html_writer::select($readers, 'logreader', $reportlog->selectedlogreader, false,
['class' => 'me-2 mb-2']);
echo html_writer::select($readers, 'logreader', $reportlog->selectedlogreader, false);
}
echo html_writer::start_div('mt-1');
echo html_writer::end_div();
echo html_writer::start_div('mt-2');
echo html_writer::empty_tag('input', array('type' => 'submit',
'value' => get_string('gettheselogs'), 'class' => 'btn btn-primary'));
echo html_writer::end_div();
}
echo html_writer::end_div();
echo html_writer::end_tag('form');
}
@ -201,7 +196,7 @@ class report_log_renderer extends plugin_renderer_base {
if (!empty($courses) && $reportlog->showcourses) {
$result .= html_writer::label(get_string('selectacourse'), 'menuid', false, ['class' => 'accesshide']);
$result .= html_writer::select($courses, "id", $selectedcourseid, null, ['class' => 'me-2 mb-2']);
$result .= html_writer::select($courses, "id", $selectedcourseid, null);
return $result;
}
@ -210,7 +205,7 @@ class report_log_renderer extends plugin_renderer_base {
$courses[$selectedcourseid] = get_course_display_name_for_list($reportlog->course) . $courseinfo;
$result .= html_writer::label(get_string('selectacourse'), 'menuid', false, ['class' => 'accesshide']);
$result .= html_writer::select($courses, "id", $selectedcourseid, false, ['class' => 'me-2 mb-2']);
$result .= html_writer::select($courses, "id", $selectedcourseid, false);
// Check if user is admin and this came because of limitation on number of courses to show in dropdown.
if (has_capability('report/log:view', $sitecontext)) {
@ -268,7 +263,7 @@ class report_log_renderer extends plugin_renderer_base {
name: "modid",
selected: $reportlog->modid,
nothing: get_string("allactivities"),
attributes: ['class' => 'me-2 mb-2'],
attributes: [],
disabled: $disabled,
);
return $result;