Skip to content

Commit 694d46c

Browse files
committed
MOBILE-4616 reports: Fix load more calculation
1 parent 3b55e69 commit 694d46c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
5555
new BehaviorSubject<CoreReportBuilderReportDetailState>({
5656
report: null,
5757
loaded: false,
58-
canLoadMoreRows: true,
58+
canLoadMoreRows: false,
5959
errorLoadingRows: false,
6060
cardviewShowFirstTitle: false,
6161
cardVisibleColumns: 1,
@@ -126,6 +126,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
126126
report,
127127
cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns,
128128
cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle,
129+
canLoadMoreRows: report.data.totalrowcount > report.data.rows.length,
129130
});
130131

131132
this.logView(report);
@@ -175,7 +176,6 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
175176
this.updateState({ page: 0, canLoadMoreRows: false });
176177
await CoreUtils.ignoreErrors(this.getReport());
177178
await ionRefresher?.complete();
178-
this.updateState({ canLoadMoreRows: true });
179179
}
180180

181181
/**
@@ -225,12 +225,12 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
225225
],
226226
},
227227
},
228+
canLoadMoreRows: newReport.data.totalrowcount > report.data.rows.length + newReport.data.rows.length,
228229
});
229230
} catch (error) {
230231
CoreDomUtils.showErrorModalDefault(error, 'Error loading more reports');
231232

232-
this.updateState({ canLoadMoreRows: false });
233-
this.updateState({ errorLoadingRows: true });
233+
this.updateState({ canLoadMoreRows: false, errorLoadingRows: true });
234234
}
235235

236236
complete();

0 commit comments

Comments
 (0)