MOBILE-4616 reports: Fix load more calculation
parent
3b55e699aa
commit
694d46c99c
|
@ -55,7 +55,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
|
|||
new BehaviorSubject<CoreReportBuilderReportDetailState>({
|
||||
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();
|
||||
|
|
Loading…
Reference in New Issue