From ef6342dfe539b9dcc64fa0fa3999662bb0d498ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 12 May 2021 12:34:41 +0200
Subject: [PATCH] MOBILE-3320 course: Fix section download status

---
 .../components/download-refresh/download-refresh.scss |  2 ++
 .../course/components/format/core-course-format.html  |  8 ++++----
 .../features/course/components/format/format.scss     | 11 ++++++++---
 .../course/services/module-prefetch-delegate.ts       |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/core/components/download-refresh/download-refresh.scss b/src/core/components/download-refresh/download-refresh.scss
index b03f953f8..3ee2b9406 100644
--- a/src/core/components/download-refresh/download-refresh.scss
+++ b/src/core/components/download-refresh/download-refresh.scss
@@ -5,4 +5,6 @@
     align-items: center;
     justify-content: space-around;
     align-content: center;
+    min-height: var(--a11y-min-target-size);
+    min-width: var(--a11y-min-target-size);
 }
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 0200201de..83df84652 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -17,7 +17,7 @@
             <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
 
                 <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
-                    class="ion-text-wrap clearfix ion-justify-content-between core-button-selector-row"
+                    class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row"
                     [class.core-section-download]="downloadEnabled">
                     <core-combobox [modalOptions]="sectionSelectorModalOptions" interface="modal" listboxId="core-course-section-button"
                         icon="fas-folder" [label]="'core.course.section' | translate" (onChange)="sectionChanged($event)">
@@ -122,8 +122,6 @@
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                     </core-format-text>
                 </h2>
-                <!-- Section download. -->
-                <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: section}"></ng-container>
                 <p *ngIf="section.visible === 0 || section.availabilityinfo">
                     <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap">
                         {{ 'core.course.hiddenfromstudents' | translate }}
@@ -137,6 +135,8 @@
                     </ion-badge>
                 </p>
             </ion-label>
+            <!-- Section download. -->
+            <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: section}"></ng-container>
         </ion-item-divider>
 
         <ion-item class="ion-text-wrap" *ngIf="section.summary">
@@ -155,7 +155,7 @@
 
 <!-- Template to render a section download button/progress. -->
 <ng-template #sectionDownloadTemplate let-section="section">
-    <div *ngIf="section && downloadEnabled" class="core-button-spinner ion-float-end">
+    <div *ngIf="section && downloadEnabled" slot="end">
         <!-- Download progress. -->
         <ion-badge class="core-course-download-section-progress"
             *ngIf="section.isDownloading && section.total > 0 && section.count < section.total">
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index bd62cd001..027504d87 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -45,6 +45,13 @@
         }
     }
 
+    .core-button-selector-row {
+        display: flex;
+        core-combobox {
+            flex-grow: 1;
+        }
+    }
+
 // @todo
 //     .item-divider  {
 //         .label {
@@ -70,8 +77,6 @@
 //         @include padding(null, 0, null, null);
 //     }
 
-//     .core-button-selector-row {
-//         @include safe-area-padding-start($content-padding !important, $content-padding);
-//     }
+//
 
 }
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index aca8154ae..f315b6917 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -724,7 +724,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         await Promise.all(modules.map(async (module) => {
             const handler = this.getPrefetchHandlerFor(module);
-            if (!handler || onlyToDisplay || handler.skipListStatus) {
+            if (!handler || (onlyToDisplay && handler.skipListStatus)) {
                 return;
             }