From 8ce5414980586a68425f766a5524b3c849fe2674 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 May 2023 09:49:01 +0200
Subject: [PATCH] MOBILE-4270 calendar: Make course filter list consistent with
 LMS

---
 src/addons/calendar/components/filter/filter.html | 4 ++--
 src/addons/calendar/components/filter/filter.ts   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/addons/calendar/components/filter/filter.html b/src/addons/calendar/components/filter/filter.html
index 0a344811a..65dee4fd4 100644
--- a/src/addons/calendar/components/filter/filter.html
+++ b/src/addons/calendar/components/filter/filter.html
@@ -17,9 +17,9 @@
         <core-spacer *ngIf="filter.course || filter.category || filter.group"></core-spacer>
         <ng-container *ngIf="filter.course || filter.category || filter.group">
             <ion-radio-group [(ngModel)]="courseId" (ionChange)="onChange()">
-                <ion-item class="ion-text-wrap" *ngFor="let course of courses">
+                <ion-item class="ion-text-wrap" *ngFor="let course of sortedCourses">
                     <ion-label>
-                        <core-format-text [text]="course.fullname"></core-format-text>
+                        <core-format-text [text]="course.shortname"></core-format-text>
                     </ion-label>
                     <ion-radio slot="end" [value]="course.id"></ion-radio>
                 </ion-item>
diff --git a/src/addons/calendar/components/filter/filter.ts b/src/addons/calendar/components/filter/filter.ts
index 9d25721b2..c13e6e372 100644
--- a/src/addons/calendar/components/filter/filter.ts
+++ b/src/addons/calendar/components/filter/filter.ts
@@ -30,6 +30,7 @@ import { AddonCalendarFilter, AddonCalendarEventIcons } from '../../services/cal
 })
 export class AddonCalendarFilterComponent implements OnInit {
 
+    @Input() courses: Partial<CoreEnrolledCourseData>[] = [];
     @Input() filter: AddonCalendarFilter = {
         filtered: false,
         courseId: undefined,
@@ -42,10 +43,9 @@ export class AddonCalendarFilterComponent implements OnInit {
     };
 
     courseId = -1;
-
-    @Input() courses: Partial<CoreEnrolledCourseData>[] = [];
     typeIcons: AddonCalendarEventIcons[] = [];
     types: string[] = [];
+    sortedCourses: Partial<CoreEnrolledCourseData>[] = [];
 
     constructor() {
         CoreUtils.enumKeys(AddonCalendarEventType).forEach((name) => {
@@ -61,6 +61,9 @@ export class AddonCalendarFilterComponent implements OnInit {
      */
     ngOnInit(): void {
         this.courseId = this.filter.courseId || -1;
+
+        this.sortedCourses = Array.from(this.courses)
+            .sort((a, b) => (a.shortname?.toLowerCase() ?? '').localeCompare(b.shortname?.toLowerCase() ?? ''));
     }
 
     /**