[3.3] Add pagination to datasetmanager.php #2202
Conversation
|
|
||
| private $conn; | ||
| private $collArr = array(); | ||
| private $datasetId = 0; | ||
| private $errorArr = array(); | ||
| private $occurrenceCount = null; |
| return false; | ||
| } | ||
| return $status; | ||
| } | ||
|
|
||
| public function getOccurrences($datasetId){ | ||
| public function setOccurrenceCount($datasetId) |
| } | ||
| } | ||
|
|
||
| public function getOccurrences($datasetId, $pageNumber = 1, $retLimit = 500) |
There was a problem hiding this comment.
modified method
| return $returnVal; | ||
| } | ||
|
|
||
| public function getOccurrenceCount($datasetId) |
…ions/listtabledisplay.php
| if($occArr = $datasetManager->getOccurrences($datasetId)){ | ||
| ?> | ||
| $retLimit = 200; | ||
| if ($occArr = $datasetManager->getOccurrences($datasetId, $pageNumber, $retLimit)) { |
There was a problem hiding this comment.
Updated based on change in method signature.
| <?php echo '<b>'.$LANG['COUNT'].': '.count($occArr).' '.$LANG['RECORDS'].'</b>'; ?> | ||
| <?php echo '<b>' . $LANG['COUNT'] . ': ' . count($occArr) . ' ' . $LANG['RECORDS'] . '</b>'; ?> | ||
| </div> | ||
| <div class="bottom-breathing-room-rel"> |
There was a problem hiding this comment.
Add the pagination div
|
When you have lots of pages you get this monstrosity Can we hide a bunch of these under a dropdown list, or three dots in the middle then the last page is it's own link? Here's how we do it in collections/list Although I think I would rather have a dropdown list of all the in-between numbers and an actual number for the last page instead of just "Last". |
…lay a little better
Should be resolved now. Per chat on Teams, links to neighboring 10 pages (when available; fewer if not; occasionally 11 because this logic was weird and hurt my brain) provided in a "sliding window" plus always a link to first page and last page. An input field for a page number is available in between for quick access to any target page. Some form validation present for said input field (users can't enter page options that don't exist). When the screen size gets too small to fit all of this, only the first page and last page links (as well a jump to page input field) are provided. |
|
@Atticus29 I found one edge case between 1050 and about 880 pixels where the last page floats off the page |
Fixed in b2fc870 and 8cc5859. I added another behavior at intermediate screen sizes where only the odd page number links in the sliding window get shown. |
Description
This PR closes #2200 . It also autoformats the invovled files quite a bit, so I added comments to the "Files changed" tab above where the meaningful changes were made.
Currently, the maximum number of records displayed per page is an arbitrary 200, but I'm happy to change it.
Before
After
Pull Request Checklist:
Pre-Approval
masterbranch and PR'd using the merge option (not squashed) into thehotfixbranch.Developmentbranch, NOTmasterPost-Approval
Developmentbranch, remember to use the squash & merge optionhotfixbranch, remember to use the merge option (i.e., no squash).Developmentbranch into the master branch, remember to use the merge optionhotfixbranch into themasterbranch use the squash & merge optionmasterintoDevelopmentshould be made with the merge option (i.e., no squash).hotfixbranch and create a newhotfixbranchhotfixbranch.Developmentbranch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock theDevelopmentbranch to prevent accidental merges while QA takes place. Follow the release protocol here.Thanks for contributing and keeping it clean!