From 249e279406e1466ba895a08eb8088ffa8de97c34 Mon Sep 17 00:00:00 2001 From: Alfonso Salces Date: Fri, 24 Feb 2023 10:46:08 +0100 Subject: [PATCH 1/2] MOBILE-4077 ReportBuilder: Open in browser report detail if fails --- .../components/report-detail/report-detail.ts | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.ts b/src/core/features/reportbuilder/components/report-detail/report-detail.ts index fac760e0a..873dc76f9 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts @@ -23,8 +23,11 @@ import { import { IonRefresher } from '@ionic/angular'; import { CoreNavigator } from '@services/navigator'; import { CoreScreen } from '@services/screen'; +import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; +import { CoreTextErrorObject } from '@services/utils/text'; import { CoreUtils } from '@services/utils/utils'; +import { Translate } from '@singletons'; import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -111,8 +114,33 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { }); this.onReportLoaded.emit(report.details); - } catch (err) { - await CoreDomUtils.showErrorModal(err); + } catch { + const errorConfig: CoreTextErrorObject = { + title: Translate.instant('core.error'), + body: ` +

${Translate.instant('addon.mod_page.errorwhileloadingthepage')}

+

${Translate.instant('core.course.useactivityonbrowser')}

+ `, + buttons: [ + { + text: Translate.instant('core.cancel'), + role: 'cancel', + handler: async () => await CoreNavigator.back(), + }, + { + text: Translate.instant('core.openinbrowser'), + role: 'confirm', + handler: async () => { + const site = CoreSites.getRequiredCurrentSite(); + const href = `${site.getURL()}/reportbuilder/view.php?id=${this.reportId}`; + await CoreUtils.openInBrowser(href, { showBrowserWarning: false }); + await CoreNavigator.back(); + }, + }, + ], + }; + + await CoreDomUtils.showErrorModal(errorConfig); } } From edf0eab940572dfbb3404bf98b6be683137c072b Mon Sep 17 00:00:00 2001 From: Alfonso Salces Date: Fri, 24 Feb 2023 10:46:45 +0100 Subject: [PATCH 2/2] MOBILE-4077 ReportBuilder: Fix report summary redirection --- .../components/report-summary/report-summary.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ae9116769..08bbdecd4 100644 --- a/src/core/features/reportbuilder/components/report-summary/report-summary.html +++ b/src/core/features/reportbuilder/components/report-summary/report-summary.html @@ -39,8 +39,8 @@

- + +