EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2509 from dpalou/MOBILE-3359 

MOBILE-3359 myoverview: Fix issue if all filters disabled
main
Juan Leyva 2020-09-09 16:31:03 +02:00 committed by GitHub
parent 72b2954d1a 7c2c4e110d
commit 4c840445db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/addon/block/myoverview/components/myoverview/myoverview.ts
View File

@ -77,6 +77,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
downloadCourseEnabled: boolean; downloadCourseEnabled: boolean;
downloadCoursesEnabled: boolean; downloadCoursesEnabled: boolean;
protected FILTER_PRIORITY = ['all', 'allincludinghidden', 'inprogress', 'future', 'past', 'favourite', 'hidden', 'custom'];
protected prefetchIconsInitialized = false; protected prefetchIconsInitialized = false;
protected isDestroyed; protected isDestroyed;
protected coursesObserver; protected coursesObserver;
@ -202,9 +203,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.initCourseFilters(courses); this.initCourseFilters(courses);
this.showSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
typeof courses[0].enddate != 'undefined');
this.courses.filter = ''; this.courses.filter = '';
this.showFilter = false; this.showFilter = false;
@ -250,10 +248,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.showSelectorFilter = Object.keys(this.showFilters).some((key) => { this.showSelectorFilter = Object.keys(this.showFilters).some((key) => {
return this.showFilters[key] == 'show'; return this.showFilters[key] == 'show';
}); });
if (!this.showSelectorFilter) {
// All filters disabled, display all the courses.
this.showFilters.all = 'show';
}
} }
if (!this.showSelectorFilter || (this.selectedFilter === 'inprogress' && this.showFilters.inprogress == 'disabled')) { if (!this.showSelectorFilter) {
// No selector, or the default option is disabled, show all. // No selector, display all the courses.
this.selectedFilter = 'all'; this.selectedFilter = 'all';
} }
this.setCourseFilter(this.selectedFilter); this.setCourseFilter(this.selectedFilter);
@ -388,7 +391,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
if (this.showFilters[filter] == 'show') { if (this.showFilters[filter] == 'show') {
this.filteredCourses = this.courses[filter]; this.filteredCourses = this.courses[filter];
} else { } else {
const activeFilter = Object.keys(this.showFilters).find((name) => { const activeFilter = this.FILTER_PRIORITY.find((name) => {
return this.showFilters[name] == 'show'; return this.showFilters[name] == 'show';
}); });