From d332c7e1d4b8f05d325d204bf231b907b966adb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Sep 2020 09:38:16 +0200
Subject: [PATCH 1/3] MOBILE-3523 emulator: Change some wrong comments

---
 src/core/emulator/providers/local-notifications.ts | 2 +-
 src/core/emulator/providers/network.ts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/emulator/providers/local-notifications.ts b/src/core/emulator/providers/local-notifications.ts
index affff2e19..3809cf63d 100644
--- a/src/core/emulator/providers/local-notifications.ts
+++ b/src/core/emulator/providers/local-notifications.ts
@@ -24,7 +24,7 @@ import * as moment from 'moment';
 import { Subject, Observable } from 'rxjs';
 
 /**
- * Emulates the Cordova Globalization plugin in desktop apps and in browser.
+ * Emulates the Local Notifications plugin in desktop apps and in browser.
  */
 @Injectable()
 export class LocalNotificationsMock extends LocalNotifications {
diff --git a/src/core/emulator/providers/network.ts b/src/core/emulator/providers/network.ts
index cc036247e..bb90a2c6c 100644
--- a/src/core/emulator/providers/network.ts
+++ b/src/core/emulator/providers/network.ts
@@ -17,7 +17,7 @@ import { Network } from '@ionic-native/network';
 import { Observable, Subject } from 'rxjs';
 
 /**
- * Emulates the Cordova Globalization plugin in desktop apps and in browser.
+ * Emulates the Ionic Network plugin in desktop apps and in browser.
  */
 @Injectable()
 export class NetworkMock extends Network {

From 06c63eb77e114c25b66e5dbc87ac0da6c60b8648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Sep 2020 11:26:18 +0200
Subject: [PATCH 2/3] MOBILE-3557 course: Show Not available message on section
 title visible

---
 scripts/langindex.json                                       | 1 +
 src/assets/lang/en.json                                      | 1 +
 src/core/course/components/format/core-course-format.html    | 5 +++--
 src/core/course/pages/section-selector/section-selector.html | 1 +
 src/lang/en.json                                             | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index df9739345..51096032f 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1906,6 +1906,7 @@
   "core.noresults": "moodle",
   "core.noselection": "form",
   "core.notapplicable": "local_moodlemobileapp",
+  "core.notavailable": "moodle",
   "core.notenrolledprofile": "moodle",
   "core.notice": "moodle",
   "core.notingroup": "moodle",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 6d3fd2ffe..c21658b17 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1906,6 +1906,7 @@
     "core.noresults": "No results",
     "core.noselection": "No selection",
     "core.notapplicable": "n/a",
+    "core.notavailable": "Not available",
     "core.notenrolledprofile": "This profile is not available because this user is not enrolled in this course.",
     "core.notice": "Notice",
     "core.notingroup": "Sorry, but you need to be part of a group to see this page.",
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 8ce6d7b62..fe87a85a1 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -73,12 +73,13 @@
 <ng-template #sectionTemplate let-section="section">
     <section ion-list *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
         <!-- Title is only displayed when viewing all sections. -->
-        <ion-item-divider text-wrap color="light" *ngIf="selectedSection.id == allSectionsId && section.name" [class.core-section-download]="downloadEnabled">
+        <ion-item-divider text-wrap color="light" *ngIf="selectedSection.id == allSectionsId && section.name" [class.core-section-download]="downloadEnabled" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
             <!-- Section download. -->
             <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: section}"></ng-container>
-            <p *ngIf="(section.visible === 0 && section.uservisible !== false) || section.availabilityinfo">
+            <p *ngIf="section.visible === 0 || section.availabilityinfo">
                 <ion-badge color="secondary" *ngIf="section.visible === 0 && section.uservisible !== false" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
+                <ion-badge color="secondary" *ngIf="section.visible === 0 && section.uservisible === false" text-wrap>{{ 'core.notavailable' | translate }}</ion-badge>
                 <ion-badge color="secondary" *ngIf="section.availabilityinfo" text-wrap><core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></ion-badge>
             </p>
         </ion-item-divider>
diff --git a/src/core/course/pages/section-selector/section-selector.html b/src/core/course/pages/section-selector/section-selector.html
index e8af2bc87..9fdbf9eb8 100644
--- a/src/core/course/pages/section-selector/section-selector.html
+++ b/src/core/course/pages/section-selector/section-selector.html
@@ -16,6 +16,7 @@
                 <h2><core-format-text [text]="section.formattedName || section.name" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></h2>
                 <core-progress-bar *ngIf="section.progress >= 0" [progress]="section.progress"></core-progress-bar>
                 <ion-badge color="secondary" *ngIf="section.visible === 0 && section.uservisible !== false" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
+                <ion-badge color="secondary" *ngIf="section.visible === 0 && section.uservisible === false" text-wrap>{{ 'core.notavailable' | translate }}</ion-badge>
                 <ion-badge color="secondary" *ngIf="section.availabilityinfo" text-wrap><core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></ion-badge>
             </a>
         </ng-container>
diff --git a/src/lang/en.json b/src/lang/en.json
index 40da0174b..b5f8447aa 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -189,6 +189,7 @@
     "noresults": "No results",
     "noselection": "No selection",
     "notapplicable": "n/a",
+    "notavailable": "Not available",
     "notenrolledprofile": "This profile is not available because this user is not enrolled in this course.",
     "notice": "Notice",
     "nooptionavailable": "No option available",

From 737e7f51e95ef74eda57eb1b0f39c94e04be2105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Sep 2020 11:26:44 +0200
Subject: [PATCH 3/3] MOBILE-3557 course: Add section restriction info when
 selected section

---
 .../components/format/core-course-format.html     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index fe87a85a1..85b927443 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -24,13 +24,20 @@
 
             <!-- Course summary. By default we only display the course progress. -->
             <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-                <ion-list no-lines *ngIf="course.imageThumb || (selectedSection && selectedSection.id == allSectionsId && course.progress != null && course.progress >= 0)" class="core-format-progress-list">
+                <ion-list no-lines *ngIf="course.imageThumb || (selectedSection && (selectedSection.id == allSectionsId && course.progress != null && course.progress >= 0) || (selectedSection.id != allSectionsId && (selectedSection.availabilityinfo || selectedSection.visible === 0)))" class="core-format-progress-list">
                     <div *ngIf="course.imageThumb" class="core-course-thumb">
                         <img [src]="course.imageThumb" core-external-content alt=""/>
                     </div>
-                    <ion-item class="core-course-progress" *ngIf="selectedSection && selectedSection.id == allSectionsId && course.progress != null && course.progress >= 0 && course.completionusertracked !== false">
-                        <core-progress-bar [progress]="course.progress"></core-progress-bar>
-                    </ion-item>
+                    <ng-container *ngIf="selectedSection">
+                        <ion-item class="core-course-progress" *ngIf="selectedSection.id == allSectionsId && course.progress != null && course.progress >= 0 && course.completionusertracked !== false">
+                            <core-progress-bar [progress]="course.progress"></core-progress-bar>
+                        </ion-item>
+                        <ion-item *ngIf="selectedSection.id != allSectionsId && (selectedSection.availabilityinfo || selectedSection.visible === 0)" >
+                            <ion-badge color="secondary" *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
+                            <ion-badge color="secondary" *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false" text-wrap>{{ 'core.notavailable' | translate }}</ion-badge>
+                            <ion-badge color="secondary" *ngIf="selectedSection.availabilityinfo" text-wrap><core-format-text [text]=" selectedSection.availabilityinfo" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></ion-badge>
+                        </ion-item>
+                    </ng-container>
                 </ion-list>
             </core-dynamic-component>