(fix) O3-4353: Fix pagination on ward allocation and ward summary #1445
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Thanks @Muppasanipraneeth! I haven't tested this out yet, but minor typo fix:
| @@ -67,14 +67,12 @@ const BedAdministrationTable: React.FC = () => { | |||
|
|
|||
| const handleBedStatusChange = ({ selectedItem }: { selectedItem: string }) => | |||
| setFilterOption(selectedItem.trim().toUpperCase()); | |||
|
|
|||
| const filteredData = useMemo(() => { | |||
| const flatendData = Array.isArray(bedsGroupedByLocation) ? bedsGroupedByLocation.flat() : []; | |||
There was a problem hiding this comment.
Suggested change
| const flatendData = Array.isArray(bedsGroupedByLocation) ? bedsGroupedByLocation.flat() : []; | |
| const flattenedData = Array.isArray(bedsGroupedByLocation) ? bedsGroupedByLocation.flat() : []; |
There was a problem hiding this comment.
updated changes
|
|
||
| const filteredData = useMemo(() => { | ||
| const flatendData = Array.isArray(bedsGroupedByLocation) ? bedsGroupedByLocation.flat() : []; | ||
| return filterOption === 'ALL' ? flatendData : flatendData.filter((bed) => bed.status === filterOption); |
There was a problem hiding this comment.
Suggested change
| return filterOption === 'ALL' ? flatendData : flatendData.filter((bed) => bed.status === filterOption); | |
| return filterOption === 'ALL' ? flattenedData : flattenedData.filter((bed) => bed.status === filterOption); |
Muppasanipraneeth
changed the title
NethmiRodrigo
approved these changes
Jan 16, 2025
NethmiRodrigo
changed the title
NethmiRodrigo
changed the title
|
Thanks @NethmiRodrigo 😊 |
harshthakkr
pushed a commit
to harshthakkr/openmrs-esm-patient-management
that referenced
this pull request
Jan 17, 2025
…enmrs#1445) * fixed pagination in ward allocation * make changes to allow to go nextpage and previous page * make changes to allow to go nextpage and previous page * fixed typo --------- Co-authored-by: Nethmi Rodrigo <34070216+NethmiRodrigo@users.noreply.github.com>
Muppasanipraneeth
deleted the
O3-4353-pagination-does-not-work-on-ward-allocation-page
branch
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
problem
1 Even though the items per page is set to 10 the page automatically shows all items available. It should show only 10 and allow the user to change the pages
2 Even though there are more than 10 beds for a ward, the pagination does not allow you to go to the next page and shows only the first ten items. You have to manually change the number of items to a larger number to see all the items.
solution
passed the filtereddata correctly to hook usePagination() and
it returns data correctly
Screenshots
Before for Inpatient ward
After for Inpatient ward
Before ward allocation
after ward allocation
Related Issue
Other