From b350c7a52e926ef95160a32365ea5ef17362e2c2 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 7 May 2018 08:34:54 +0200 Subject: [PATCH] MOBILE-2345 lesson: Fix issues with prefetch and offline --- src/addon/mod/lesson/providers/lesson.ts | 4 +++- src/core/course/components/module/module.ts | 2 +- src/core/settings/lang/en.json | 1 + src/providers/utils/text.ts | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/addon/mod/lesson/providers/lesson.ts b/src/addon/mod/lesson/providers/lesson.ts index 7cfbd6091..529b332e4 100644 --- a/src/addon/mod/lesson/providers/lesson.ts +++ b/src/addon/mod/lesson/providers/lesson.ts @@ -462,7 +462,9 @@ export class AddonModLessonProvider { return; } - if (typeof data.answer == 'object') { + if (typeof data['answer[text]'] != 'undefined') { + studentAnswer = data['answer[text]']; + } else if (typeof data.answer == 'object') { studentAnswer = data.answer.text; } else { studentAnswer = data.answer; diff --git a/src/core/course/components/module/module.ts b/src/core/course/components/module/module.ts index 7ab0a91b7..ccc71b055 100644 --- a/src/core/course/components/module/module.ts +++ b/src/core/course/components/module/module.ts @@ -139,7 +139,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy { this.spinner = true; // Get download size to ask for confirm if it's high. - this.prefetchHandler.getDownloadSize(this.module, this.courseId).then((size) => { + this.prefetchHandler.getDownloadSize(this.module, this.courseId, true).then((size) => { return this.courseHelper.prefetchModule(this.prefetchHandler, this.module, size, this.courseId, refresh); }).catch((error) => { // Error, hide spinner. diff --git a/src/core/settings/lang/en.json b/src/core/settings/lang/en.json index 00ac951bd..a68e5bcf7 100644 --- a/src/core/settings/lang/en.json +++ b/src/core/settings/lang/en.json @@ -17,6 +17,7 @@ "disableall": "Disable notifications", "disabled": "Disabled", "displayformat": "Display format", + "enabledownloadsection": "Enable download sections", "enablerichtexteditor": "Enable text editor", "enablerichtexteditordescription": "If enabled, a text editor will be available when entering content.", "enablesyncwifi": "Allow sync only when on Wi-Fi", diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts index 9e47ed8ea..5d3fcbcf1 100644 --- a/src/providers/utils/text.ts +++ b/src/providers/utils/text.ts @@ -131,6 +131,10 @@ export class CoreTextUtilsProvider { * @return {string} Clean text. */ cleanTags(text: string, singleLine?: boolean): string { + if (typeof text == 'number') { + return text; + } + if (!text) { return ''; }