From e9237358a156423cb09d7e9cd07dc394b821bb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 21 Dec 2018 13:09:42 +0100 Subject: [PATCH] MOBILE-2614 dashboard: Sort courses on refresh --- .../components/myoverview/myoverview.ts | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts index 59b87cb3f..ee4f77101 100644 --- a/src/addon/block/myoverview/components/myoverview/myoverview.ts +++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts @@ -243,6 +243,21 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem * @param {any[]} courses Courses to filter. */ initCourseFilters(courses: any[]): void { + if (this.showSortFilter) { + if (this.sort == 'lastaccess') { + courses.sort((a, b) => { + return b.lastaccess - a.lastaccess; + }); + } else if (this.sort == 'fullname') { + courses.sort((a, b) => { + const compareA = a.fullname.toLowerCase(), + compareB = b.fullname.toLowerCase(); + + return compareA.localeCompare(compareB); + }); + } + } + this.courses.all = []; this.courses.past = []; this.courses.inprogress = []; @@ -285,24 +300,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem switchSort(sort: string): void { this.sort = sort; this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewSort', this.sort); - const courses = this.courses.all.concat(this.courses.hidden); - - if (this.showSortFilter) { - if (this.sort == 'lastaccess') { - courses.sort((a, b) => { - return b.lastaccess - a.lastaccess; - }); - } else if (this.sort == 'fullname') { - courses.sort((a, b) => { - const compareA = a.fullname.toLowerCase(), - compareB = b.fullname.toLowerCase(); - - return compareA.localeCompare(compareB); - }); - } - } - - this.initCourseFilters(courses); + this.initCourseFilters(this.courses.all.concat(this.courses.hidden)); } /**