From 694d46c99cef92851703aec6356b79163f89992e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 9 Oct 2024 15:31:55 +0200 Subject: [PATCH] MOBILE-4616 reports: Fix load more calculation --- .../components/report-detail/report-detail.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 3974047e0..69f0088d3 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts @@ -55,7 +55,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { new BehaviorSubject({ report: null, loaded: false, - canLoadMoreRows: true, + canLoadMoreRows: false, errorLoadingRows: false, cardviewShowFirstTitle: false, cardVisibleColumns: 1, @@ -126,6 +126,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { report, cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns, cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle, + canLoadMoreRows: report.data.totalrowcount > report.data.rows.length, }); this.logView(report); @@ -175,7 +176,6 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { this.updateState({ page: 0, canLoadMoreRows: false }); await CoreUtils.ignoreErrors(this.getReport()); await ionRefresher?.complete(); - this.updateState({ canLoadMoreRows: true }); } /** @@ -225,12 +225,12 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { ], }, }, + canLoadMoreRows: newReport.data.totalrowcount > report.data.rows.length + newReport.data.rows.length, }); } catch (error) { CoreDomUtils.showErrorModalDefault(error, 'Error loading more reports'); - this.updateState({ canLoadMoreRows: false }); - this.updateState({ errorLoadingRows: true }); + this.updateState({ canLoadMoreRows: false, errorLoadingRows: true }); } complete();