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

Merge pull request #1670 from dpalou/MOBILE-2697 

MOBILE-2697 course: Fix course options order
main
Juan Leyva 2018-12-17 14:24:32 +01:00 committed by GitHub
parent cbc25c322d 528cc88a9f
commit 783b7fe3a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/competency/providers/course-option-handler.ts
View File

@ -24,7 +24,7 @@ import { AddonCompetencyProvider } from '../providers/competency';
@Injectable() @Injectable()
export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHandler { export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHandler {
name = 'AddonCompetency'; name = 'AddonCompetency';
priority = 700; priority = 300;
constructor(private competencyProvider: AddonCompetencyProvider) {} constructor(private competencyProvider: AddonCompetencyProvider) {}

9
src/core/course/providers/options-delegate.ts
View File

@ -262,7 +262,8 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
const accessData = { const accessData = {
type: isGuest ? CoreCourseProvider.ACCESS_GUEST : CoreCourseProvider.ACCESS_DEFAULT type: isGuest ? CoreCourseProvider.ACCESS_GUEST : CoreCourseProvider.ACCESS_DEFAULT
}; },
handlersToDisplay: CoreCourseOptionsHandlerToDisplay[] = [];
if (navOptions) { if (navOptions) {
course.navOptions = navOptions; course.navOptions = navOptions;
@ -275,8 +276,7 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
// Call getHandlersForAccess to make sure the handlers have been loaded. // Call getHandlersForAccess to make sure the handlers have been loaded.
return this.getHandlersForAccess(course.id, refresh, accessData, course.navOptions, course.admOptions); return this.getHandlersForAccess(course.id, refresh, accessData, course.navOptions, course.admOptions);
}).then(() => { }).then(() => {
const handlersToDisplay: CoreCourseOptionsHandlerToDisplay[] = [], const promises = [];
promises = [];
this.coursesHandlers[course.id].enabledHandlers.forEach((handler) => { this.coursesHandlers[course.id].enabledHandlers.forEach((handler) => {
promises.push(Promise.resolve(handler.getDisplayData(injector, course)).then((data) => { promises.push(Promise.resolve(handler.getDisplayData(injector, course)).then((data) => {
@ -291,6 +291,9 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
})); }));
}); });
return Promise.all(promises);
}).then(() => {
// Sort them by priority. // Sort them by priority.
handlersToDisplay.sort((a, b) => { handlersToDisplay.sort((a, b) => {
return b.priority - a.priority; return b.priority - a.priority;