Skip to content

Commit cbbc5d0

Browse files
MOBILE-4077 ReportBuilder: Add filter advice in report-summary
1 parent 9a16548 commit cbbc5d0

File tree

6 files changed

+30
-5
lines changed

6 files changed

+30
-5
lines changed

scripts/langindex.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,7 @@
16561656
"core.reportbuilder.reports": "moodle",
16571657
"core.reportbuilder.reportsource": "moodle",
16581658
"core.reportbuilder.timecreated": "moodle",
1659+
"core.reportbuilder.filtersapplied": "local_moodlemobileapp",
16591660
"core.reportbuilder.showcolumns": "local_moodlemobileapp",
16601661
"core.reportbuilder.hidecolumns": "local_moodlemobileapp",
16611662
"core.datastoredoffline": "local_moodlemobileapp",

src/core/features/reportbuilder/components/report-summary/report-summary.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ <h1>
2222
</core-format-text>
2323
</h1>
2424
</ion-label>
25-
<ion-button fill="clear" [href]="reportUrl" core-link [showBrowserWarning]="false"
26-
[attr.aria-label]="'core.openinbrowser' | translate" slot="end">
27-
<ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
28-
</ion-button>
2925
</ion-item>
3026

3127
<ion-item class="ion-text-wrap" [detail]="false" *ngFor="let item of reportDetailToDisplay">
@@ -37,3 +33,16 @@ <h1>
3733
</ion-item>
3834
</div>
3935
</ion-content>
36+
37+
<ion-footer class="ion-no-border">
38+
<ion-item class="ion-text-wrap filters-info">
39+
<ion-label>
40+
<p>
41+
<ion-icon name="fas-info-circle" aria-hidden="true"></ion-icon>
42+
<core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" contextLevel="report"
43+
[contextInstanceId]="reportDetail.id">
44+
</core-format-text>
45+
</p>
46+
</ion-label>
47+
</ion-item>
48+
</ion-footer>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@import "~theme/globals";
2+
3+
.filters-info {
4+
padding-bottom: 1rem;
5+
}
6+
7+
ion-footer {
8+
ion-icon {
9+
font-size: 16px;
10+
color: $blue;
11+
margin-right: .3rem;
12+
vertical-align: middle;
13+
}
14+
}

src/core/features/reportbuilder/components/report-summary/report-summary.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { ModalController } from '@singletons';
2121
@Component({
2222
selector: 'core-report-builder-report-summary',
2323
templateUrl: './report-summary.html',
24+
styleUrls: ['./report-summary.scss'],
2425
changeDetection: ChangeDetectionStrategy.OnPush,
2526
})
2627
export class CoreReportBuilderReportSummaryComponent implements OnInit {

src/core/features/reportbuilder/lang.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"modifiedby": "Modified by",
33
"reports": "Reports",
4+
"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>",
45
"reportsource": "Report source",
56
"timecreated": "Time created",
67
"showcolumns": "Show columns",

src/core/features/reportbuilder/reportbuilder.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ const routes: Routes = [
2828

2929
@NgModule({
3030
imports: [
31-
CoreMainMenuRoutingModule.forChild({ children: routes }),
3231
CoreMainMenuTabRoutingModule.forChild(routes),
3332
],
3433
exports: [CoreMainMenuRoutingModule],

0 commit comments

Comments
 (0)