From cbbc5d0aaeaa72f728f6101d98597d4db1fcd0c7 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Tue, 7 Feb 2023 14:53:52 +0100
Subject: [PATCH] MOBILE-4077 ReportBuilder: Add filter advice in
 report-summary

---
 scripts/langindex.json                          |  1 +
 .../report-summary/report-summary.html          | 17 +++++++++++++----
 .../report-summary/report-summary.scss          | 14 ++++++++++++++
 .../components/report-summary/report-summary.ts |  1 +
 src/core/features/reportbuilder/lang.json       |  1 +
 .../reportbuilder/reportbuilder.module.ts       |  1 -
 6 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 src/core/features/reportbuilder/components/report-summary/report-summary.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index b451b9660..bc5b434d3 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1656,6 +1656,7 @@
   "core.reportbuilder.reports": "moodle",
   "core.reportbuilder.reportsource": "moodle",
   "core.reportbuilder.timecreated": "moodle",
+  "core.reportbuilder.filtersapplied": "local_moodlemobileapp",
   "core.reportbuilder.showcolumns": "local_moodlemobileapp",
   "core.reportbuilder.hidecolumns": "local_moodlemobileapp",
   "core.datastoredoffline": "local_moodlemobileapp",
diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.html b/src/core/features/reportbuilder/components/report-summary/report-summary.html
index 7c37437c4..162a46a58 100644
--- a/src/core/features/reportbuilder/components/report-summary/report-summary.html
+++ b/src/core/features/reportbuilder/components/report-summary/report-summary.html
@@ -22,10 +22,6 @@
                     </core-format-text>
                 </h1>
             </ion-label>
-            <ion-button fill="clear" [href]="reportUrl" core-link [showBrowserWarning]="false"
-                [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
-                <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
         </ion-item>
 
         <ion-item class="ion-text-wrap" [detail]="false" *ngFor="let item of reportDetailToDisplay">
@@ -37,3 +33,16 @@
         </ion-item>
     </div>
 </ion-content>
+
+<ion-footer class="ion-no-border">
+    <ion-item class="ion-text-wrap filters-info">
+        <ion-label>
+            <p>
+                <ion-icon name="fas-info-circle" aria-hidden="true"></ion-icon>
+                <core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" contextLevel="report"
+                    [contextInstanceId]="reportDetail.id">
+                </core-format-text>
+            </p>
+        </ion-label>
+    </ion-item>
+</ion-footer>
diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.scss b/src/core/features/reportbuilder/components/report-summary/report-summary.scss
new file mode 100644
index 000000000..32bb1fe4e
--- /dev/null
+++ b/src/core/features/reportbuilder/components/report-summary/report-summary.scss
@@ -0,0 +1,14 @@
+@import "~theme/globals";
+
+.filters-info {
+    padding-bottom: 1rem;
+}
+
+ion-footer {
+    ion-icon {
+        font-size: 16px;
+        color: $blue;
+        margin-right: .3rem;
+        vertical-align: middle;
+    }
+}
diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.ts b/src/core/features/reportbuilder/components/report-summary/report-summary.ts
index 712914e3a..a08e8cd95 100644
--- a/src/core/features/reportbuilder/components/report-summary/report-summary.ts
+++ b/src/core/features/reportbuilder/components/report-summary/report-summary.ts
@@ -21,6 +21,7 @@ import { ModalController } from '@singletons';
 @Component({
     selector: 'core-report-builder-report-summary',
     templateUrl: './report-summary.html',
+    styleUrls: ['./report-summary.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CoreReportBuilderReportSummaryComponent implements OnInit {
diff --git a/src/core/features/reportbuilder/lang.json b/src/core/features/reportbuilder/lang.json
index 3ff518a5f..08f70940e 100644
--- a/src/core/features/reportbuilder/lang.json
+++ b/src/core/features/reportbuilder/lang.json
@@ -1,6 +1,7 @@
 {
     "modifiedby": "Modified by",
     "reports": "Reports",
+    "filtersapplied": "There may be filters applied to this view. To edit filters or change the sorting order, <a href=\"{{$a}}\">open this report on your browser.</a>",
     "reportsource": "Report source",
     "timecreated": "Time created",
     "showcolumns": "Show columns",
diff --git a/src/core/features/reportbuilder/reportbuilder.module.ts b/src/core/features/reportbuilder/reportbuilder.module.ts
index 06dfaedf2..a905a6ced 100644
--- a/src/core/features/reportbuilder/reportbuilder.module.ts
+++ b/src/core/features/reportbuilder/reportbuilder.module.ts
@@ -28,7 +28,6 @@ const routes: Routes = [
 
 @NgModule({
     imports: [
-        CoreMainMenuRoutingModule.forChild({ children: routes }),
         CoreMainMenuTabRoutingModule.forChild(routes),
     ],
     exports: [CoreMainMenuRoutingModule],