From 93ed2ff8077dcbeb10714a8e4fed8b0641cb14bc Mon Sep 17 00:00:00 2001 From: jpl Date: Fri, 24 Feb 2017 14:42:17 +0100 Subject: Refs #2648: updating pagination feature on jp_collection --- .../journey_patterns/components/Navigate.js | 55 ++++++++++++---------- 1 file changed, 30 insertions(+), 25 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js index a5d6a5a9f..e376c6b48 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js @@ -7,37 +7,42 @@ let Navigate = ({ dispatch, journeyPatterns, pagination, status }) => { let firstPage = 1 let lastPage = Math.ceil(pagination.totalCount / window.journeyPatternsPerPage) + let ItemLength = window.journeyPatternLength + let firstItemOnPage = firstPage + (pagination.perPage * (pagination.page - firstPage)) + let lastItemOnPage = firstItemOnPage + (pagination.perPage - firstPage) + if(status.isFetching == true) { return false } if(status.fetchSuccess == true) { return ( -