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

MOBILE-3350 book: Don't pass chapterId to logView when open book

main
Dani Palou 2020-02-17 16:21:47 +01:00
parent 6d06a7e41c
commit 39fdaed6c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/addon/mod/book/components/index/index.ts
View File

@ -97,7 +97,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
if (chapterId && chapterId != this.currentChapter) { if (chapterId && chapterId != this.currentChapter) {
this.loaded = false; this.loaded = false;
this.refreshIcon = 'spinner'; this.refreshIcon = 'spinner';
this.loadChapter(chapterId); this.loadChapter(chapterId, true);
} }
} }
@ -162,7 +162,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
} }
// Show chapter. // Show chapter.
return this.loadChapter(this.currentChapter).then(() => { return this.loadChapter(this.currentChapter, refresh).then(() => {
if (downloadFailed && this.appProvider.isOnline()) { if (downloadFailed && this.appProvider.isOnline()) {
// We could load the main file but the download failed. Show error message. // We could load the main file but the download failed. Show error message.
this.showErrorDownloadingSomeFiles(downloadFailError); this.showErrorDownloadingSomeFiles(downloadFailError);
@ -179,9 +179,10 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
* Load a book chapter. * Load a book chapter.
* *
* @param chapterId Chapter to load. * @param chapterId Chapter to load.
* @param logChapterId Whether chapter ID should be passed to the log view function.
* @return Promise resolved when done. * @return Promise resolved when done.
*/ */
protected loadChapter(chapterId: string): Promise<void> { protected loadChapter(chapterId: string, logChapterId: boolean): Promise<void> {
this.currentChapter = chapterId; this.currentChapter = chapterId;
this.domUtils.scrollToTop(this.content); this.domUtils.scrollToTop(this.content);
@ -191,7 +192,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
this.nextChapter = this.bookProvider.getNextChapter(this.chapters, chapterId); this.nextChapter = this.bookProvider.getNextChapter(this.chapters, chapterId);
// Chapter loaded, log view. We don't return the promise because we don't want to block the user for this. // Chapter loaded, log view. We don't return the promise because we don't want to block the user for this.
this.bookProvider.logView(this.module.instance, chapterId, this.module.name).then(() => { this.bookProvider.logView(this.module.instance, logChapterId ? chapterId : undefined, this.module.name).then(() => {
// Module is completed when last chapter is viewed, so we only check completion if the last is reached. // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
if (this.nextChapter == '0') { if (this.nextChapter == '0') {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata); this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);