From 177b1f5066fe155c68ae4b118c271990b85f8125 Mon Sep 17 00:00:00 2001 From: David Woloszyn Date: Thu, 24 Nov 2022 20:38:59 +1100 Subject: [PATCH] MDL-76466 gradereport_user: Accordion icon uses language direction --- grade/report/user/classes/report/user.php | 4 +++- .../user/templates/user_report_category_content.mustache | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/grade/report/user/classes/report/user.php b/grade/report/user/classes/report/user.php index f5af18782be..d7ba977f33b 100644 --- a/grade/report/user/classes/report/user.php +++ b/grade/report/user/classes/report/user.php @@ -863,6 +863,8 @@ class user extends grade_report { // Category. if ($type == 'category') { + // Determine directionality so that icons can be modified to suit language. + $arrow = right_to_left() ? 'left' : 'right'; // Alter style based on whether aggregation is first or last. if ($this->switch) { $data['itemname']['class'] = $class . ' ' . "d$depth b1b b1t category"; @@ -871,7 +873,7 @@ class user extends grade_report { } $data['itemname']['colspan'] = ($this->maxdepth - $depth + count($this->tablecolumns)); $data['itemname']['content'] = $OUTPUT->render_from_template('gradereport_user/user_report_category_content', - ['categoryid' => $gradeobject->id, 'categoryname' => $fullname]); + ['categoryid' => $gradeobject->id, 'categoryname' => $fullname, 'arrow' => $arrow]); $data['itemname']['id'] = "cat_{$gradeobject->id}_{$this->user->id}"; // Get the IDs of all parent categories of this grade category. $data['parentcategories'] = array_diff(array_filter(explode('/', $gradeobject->path)), [$gradeobject->id]); diff --git a/grade/report/user/templates/user_report_category_content.mustache b/grade/report/user/templates/user_report_category_content.mustache index 9694b2146b6..7ed949b18a5 100644 --- a/grade/report/user/templates/user_report_category_content.mustache +++ b/grade/report/user/templates/user_report_category_content.mustache @@ -32,7 +32,7 @@ - + {{categoryname}}