Fixing pagination
This commit is contained in:
parent
993b50e3bc
commit
9e7d14d4c8
@ -1 +1 @@
|
|||||||
export default '6b6237cdf6e54b87ccfb69efed769bc75e6fe232';
|
export default '993b50e3bce2cc6f007212aea6d0ace66543226b';
|
||||||
|
|||||||
@ -14,6 +14,7 @@ class StudyListWithData extends Component {
|
|||||||
state = {
|
state = {
|
||||||
searchData: {},
|
searchData: {},
|
||||||
studies: null,
|
studies: null,
|
||||||
|
studyCount: 0,
|
||||||
error: null
|
error: null
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -58,9 +59,7 @@ class StudyListWithData extends Component {
|
|||||||
modalitiesInStudy: searchData.modalitiesInStudy,
|
modalitiesInStudy: searchData.modalitiesInStudy,
|
||||||
studyDateFrom: searchData.studyDateFrom,
|
studyDateFrom: searchData.studyDateFrom,
|
||||||
studyDateTo: searchData.studyDateTo,
|
studyDateTo: searchData.studyDateTo,
|
||||||
limit:
|
limit: searchData.rowsPerPage,
|
||||||
searchData.currentPage * searchData.rowsPerPage +
|
|
||||||
searchData.rowsPerPage,
|
|
||||||
offset: searchData.currentPage * searchData.rowsPerPage
|
offset: searchData.currentPage * searchData.rowsPerPage
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -83,7 +82,8 @@ class StudyListWithData extends Component {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
studies: fixedStudies
|
studies: fixedStudies,
|
||||||
|
studyCount: fixedStudies.length
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
@ -115,14 +115,12 @@ class StudyListWithData extends Component {
|
|||||||
return <div>Loading...</div>;
|
return <div>Loading...</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
const studyCount = this.state.studies ? this.state.studies.length : 0;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ConnectedHeader home={true} user={this.props.user} />
|
<ConnectedHeader home={true} user={this.props.user} />
|
||||||
<StudyList
|
<StudyList
|
||||||
studies={this.state.studies}
|
studies={this.state.studies}
|
||||||
studyCount={studyCount}
|
studyCount={this.state.studyCount}
|
||||||
studyListFunctionsEnabled={false}
|
studyListFunctionsEnabled={false}
|
||||||
onImport={this.onImport}
|
onImport={this.onImport}
|
||||||
onSelectItem={this.onSelectItem}
|
onSelectItem={this.onSelectItem}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user