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 @@ - - - @@ -37,3 +33,16 @@ + + + + +

+ + + +

+
+
+
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, open this report on your browser.", "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],