From 644f3c8a8bb76ae970180bd0fa2117ff7a82d86c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 28 Mar 2019 11:59:24 +0100
Subject: [PATCH] MOBILE-2915 lesson: Fix 'End of cluster' text displayed

---
 src/addon/mod/lesson/pages/player/player.html |  4 ++--
 src/addon/mod/lesson/providers/helper.ts      | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html
index 428adceef..0c2e2ac0b 100644
--- a/src/addon/mod/lesson/pages/player/player.html
+++ b/src/addon/mod/lesson/pages/player/player.html
@@ -32,14 +32,14 @@
             <!-- Page content. -->
             <ion-card *ngIf="!eolData && !processData">
                 <!-- Content page. -->
-                <ion-item text-wrap *ngIf="!question">
+                <ion-item text-wrap *ngIf="!question && pageContent">
                     <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"></core-format-text>
                 </ion-item>
 
                 <!-- Question page. -->
                 <!-- We need to set ngIf loaded to make formGroup directive restart every time a page changes, see MOBILE-2540. -->
                 <form *ngIf="question && loaded" ion-list [formGroup]="questionForm">
-                    <ion-item-divider text-wrap>
+                    <ion-item-divider text-wrap *ngIf="pageContent">
                         <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"></core-format-text>
                     </ion-item-divider>
 
diff --git a/src/addon/mod/lesson/providers/helper.ts b/src/addon/mod/lesson/providers/helper.ts
index e88652f6c..234c0fd45 100644
--- a/src/addon/mod/lesson/providers/helper.ts
+++ b/src/addon/mod/lesson/providers/helper.ts
@@ -27,7 +27,8 @@ import { AddonModLessonProvider } from './lesson';
 export class AddonModLessonHelperProvider {
 
     constructor(private domUtils: CoreDomUtilsProvider, private fb: FormBuilder, private translate: TranslateService,
-            private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider) { }
+            private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider,
+            private lessonProvider: AddonModLessonProvider) { }
 
     /**
      * Given the HTML of next activity link, format it to extract the href and the text.
@@ -149,8 +150,15 @@ export class AddonModLessonHelperProvider {
             return contents.innerHTML.trim();
         }
 
-        // Cannot find contents element, return the page.contents (some elements like videos might not work).
-        return data.page.contents;
+        // Cannot find contents element.
+        if (this.lessonProvider.isQuestionPage(data.page.type) ||
+                data.page.qtype == AddonModLessonProvider.LESSON_PAGE_BRANCHTABLE) {
+            // Return page.contents to prevent having duplicated elements (some elements like videos might not work).
+            return data.page.contents;
+        } else {
+            // It's an end of cluster, end of branch, etc. Return the whole pagecontent to match what's displayed in web.
+            return data.pagecontent;
+        }
     }
 
     /**