From 56edbdf5d2ccfd6e2af74bacdb08399a386880fe Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 10 Jan 2018 13:08:08 +0100
Subject: [PATCH] MOBILE-2302 courses: Fix time selector in courses overview

---
 src/core/courses/pages/my-overview/my-overview.html | 4 ++--
 src/core/courses/pages/my-overview/my-overview.ts   | 9 ++++++++-
 src/providers/sites.ts                              | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/courses/pages/my-overview/my-overview.html b/src/core/courses/pages/my-overview/my-overview.html
index 84f43acd7..976a68284 100644
--- a/src/core/courses/pages/my-overview/my-overview.html
+++ b/src/core/courses/pages/my-overview/my-overview.html
@@ -3,7 +3,7 @@
         <ion-title>{{ 'core.courses.courseoverview' | translate }}</ion-title>
 
         <ion-buttons end>
-            <button *ngIf="tabShown == 'courses' && (courses[courses.selected] || courses[courses.selected].length > 5)" ion-button icon-only [attr.aria-label]="'core.courses.filtermycourses' | translate" (click)="switchFilter()">
+            <button *ngIf="tabShown == 'courses' && courses[courses.selected] && courses[courses.selected].length > 5" ion-button icon-only [attr.aria-label]="'core.courses.filtermycourses' | translate" (click)="switchFilter()">
                 <ion-icon name="funnel"></ion-icon>
             </button>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
@@ -48,7 +48,7 @@
     </div>
     <core-loading [hideUntil]="courses.loaded" [hidden]="tabShown != 'courses'" class="core-loading-center">
         <div no-padding class="clearfix" [hidden]="showFilter">
-            <ion-select [title]="'core.show' | translate" [(ngModel)]="courses.selected" float-start>
+            <ion-select [title]="'core.show' | translate" [(ngModel)]="courses.selected" float-start (ngModelChange)="selectedChanged()">
                 <ion-option value="inprogress">{{ 'core.courses.inprogress' | translate }}</ion-option>
                 <ion-option value="future">{{ 'core.courses.future' | translate }}</ion-option>
                 <ion-option value="past">{{ 'core.courses.past' | translate }}</ion-option>
diff --git a/src/core/courses/pages/my-overview/my-overview.ts b/src/core/courses/pages/my-overview/my-overview.ts
index 77981683c..963afe4c5 100644
--- a/src/core/courses/pages/my-overview/my-overview.ts
+++ b/src/core/courses/pages/my-overview/my-overview.ts
@@ -198,7 +198,7 @@ export class CoreCoursesMyOverviewPage {
             this.filteredCourses = this.courses[this.courses.selected];
         } else {
             this.filteredCourses = this.courses[this.courses.selected].filter((course) => {
-                return course.fullname.indexOf(newValue) > -1;
+                return course.fullname.toLowerCase().indexOf(newValue.toLowerCase()) > -1;
             });
         }
     }
@@ -309,4 +309,11 @@ export class CoreCoursesMyOverviewPage {
     openSearch() {
         this.navCtrl.push('CoreCoursesSearchPage');
     }
+
+    /**
+     * The selected courses have changed.
+     */
+    selectedChanged() {
+        this.filteredCourses = this.courses[this.courses.selected];
+    }
 }
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 58f31ea0d..c3fbb5ed3 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -408,7 +408,7 @@ export class CoreSitesProvider {
                     return siteId;
                 });
             } else if (result == this.LEGACY_APP_VERSION) {
-                return Promise.reject(this.translate.instant('mm.login.legacymoodleversion'));
+                return Promise.reject(this.translate.instant('core.login.legacymoodleversion'));
             } else {
                 return Promise.reject(this.translate.instant('core.login.invalidmoodleversion'));
             }