Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pagination #2702

Merged
merged 7 commits into from
Jun 23, 2022
Merged

Conversation

shivankacker
Copy link
Member

@shivankacker shivankacker commented Jun 13, 2022

A previous PR resulted in broken pagination, fixed.
closes #2700
closes #2661

@shivankacker shivankacker requested a review from a team June 13, 2022 12:07
@shivankacker shivankacker requested a review from a team as a code owner June 13, 2022 12:07
@vercel
Copy link

vercel bot commented Jun 13, 2022

@skks1212 is attempting to deploy a commit to the Coronasafe Team on Vercel.

A member of the Team first needs to authorize it.

@netlify
Copy link

netlify bot commented Jun 13, 2022

Deploy Preview Failed. CC: @rithviknishad

Name Link
🔨 Latest commit b0df07b
🔍 Latest deploy log https://app.netlify.com/sites/care-net/deploys/62a9babaa75207000a065fa2

Copy link
Contributor

@arpancodes arpancodes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes won't work for lines 130 and 136. These lines may not be relevant either as right now we are showing next/prev buttons in smaller screens, in that case, we might need to clean up.

Do look into it.

@rithviknishad
Copy link
Member

@skks1212 can u merge the latest develop again? the one you've is one commit behind the required one and that has a typo in the build command.
image

@vercel
Copy link

vercel bot commented Jun 15, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
care-fe ✅ Ready (Inspect) Visit Preview Jun 15, 2022 at 0:47AM (UTC)

@shivankacker
Copy link
Member Author

@rithviknishad 👍

Copy link
Contributor

@arpancodes arpancodes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nihal467
Copy link
Member

test approved

@khavinshankar khavinshankar merged commit b464b8c into ohcnetwork:develop Jun 23, 2022
aeswibon pushed a commit to aeswibon/care_fe that referenced this pull request Jun 23, 2022
* fixed broken pagination

* fixed pagination for small devices
aeswibon pushed a commit to aeswibon/care_fe that referenced this pull request Jun 23, 2022
* fixed broken pagination

* fixed pagination for small devices
khavinshankar pushed a commit that referenced this pull request Jun 30, 2022
* Removed Back button

* Date of Result cannot be selected before Date of Sample given For Covid Test (#2693)

* Fix pagination (#2702)

* fixed broken pagination

* fixed pagination for small devices

* fix ordering of label (#2713)

* Added 'History of present illness' card in consultation details (#2743)

* Added Location name for Bed (#2766)

* Modified patientUrl (#2757)

* Fixed issue-deployment workflow (#2806)

* Improving the UI for notice board (#2777)

* improved UI for notice board

* loading typo

* Fixed buttons on top of patient card (#2775)

* fixed buttons on top of patient card

* fixed minor overlap

* Esc key closes the popup of update sample test status Issue#2679 (#2774)

* updated to yarn

* added function

* resolved error

* Removed current health as a field (#2772)

* update icon vertical align center (#2780)

* set min as 0 for IO Balance Editors (#2781)

* validated weight and height (#2778)

* Improve bed UI (#2699)

* improved bed ui

* optimized for mobile

* Added distinction between doctor and staff list and changed UI (#2709)

* reset base code

* changed close button

* added respiratory validation in the form (#2786)

Co-authored-by: ARYAN PATEL <patelaryan7751@gmail.com>
Co-authored-by: Shivank Kacker <kacker.shivank@gmail.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Gokulram A <40627011+GokulramGHV@users.noreply.github.com>
Co-authored-by: Kunal <61267953+kunatastic@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Asset View: Next page arrow Assets: pagination buttons are disfunctional on intital page load
5 participants