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

Visit history - correct count for displaying ALL results on a page #7386

Merged
merged 5 commits into from
May 26, 2024

Conversation

ruthkonyn
Copy link
Contributor

Fixes #7385

when displaying all the results on a page, having previously displayed a shorter page, give the correct count of results being displayed

Changes proposed in this pull request:

@ruthkonyn ruthkonyn changed the title Visit history - correct count for display all results Visit history - correct count for displaying ALL results on a page Apr 22, 2024
@sjpadgett
Copy link
Sponsor Member

sjpadgett commented May 26, 2024

@ruthkonyn unfortunately this PR has conflicts with encounter. I hoped to get in patch. Maybe you can get resolved early Monday morning before I build the patch!
Never mind I fixed the conflict. I'll review and if okay will merge

@sjpadgett
Copy link
Sponsor Member

Doesn't make sense for Styling to fail after I made and merged a fixed file so either git is trying to merge an older file(a no no) or actions is testing the older version.
So I'm going to test the theory so we'll know and merge then pull the file. My changes should still be there.

@sjpadgett sjpadgett merged commit 885ee27 into openemr:master May 26, 2024
24 of 25 checks passed
@sjpadgett
Copy link
Sponsor Member

Okay looks like actions is based on the last master merge into branch otherwise it should have picked up my merged changes.
My first question is why we don't just test against file in PR i.e. Stylings only on current PR. Some test may need to run against other files but I'm hoping there's a better way of what files we test.

@ruthkonyn
Copy link
Contributor Author

thank you @sjpadgett - so there is nothing i need to do now :-) . Thanks for accepting into the patch

sjpadgett pushed a commit to sjpadgett/openemr that referenced this pull request May 26, 2024
…penemr#7386)

* display correct count values for ALL - issue openemr#7385

* delete blank line

* escape strings on line 317

* correct style

---------

Co-authored-by: Jerry Padgett <[email protected]>
(cherry picked from commit 885ee27)
@ruthkonyn ruthkonyn deleted the visit-history-all branch May 28, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: visit history count for display of ALL results incorrect, if shorter pages displayed previously
3 participants