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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
May 26, 2024
Merged

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

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f71adfe
display correct count values for ALL - issue #7385
ruthkonyn Apr 22, 2024
22c289d
delete blank line
ruthkonyn Apr 22, 2024
e275871
escape strings on line 317
ruthkonyn Apr 23, 2024
4c76626
correct style
ruthkonyn Apr 23, 2024
bae448c
Merge branch 'master' into visit-history-all
sjpadgett May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions interface/patient_file/history/encounters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ function changePageSize() {
$name = getPatientNameFirstLast($pid);
$dob = text(oeFormatShortDate(getPatientData($pid, "DOB")['DOB']));
$external_id = getPatientData($pid, "pubpid")['pubpid'];
echo text($name) . " (" . text($external_id) . ")" . "    DOB: " . $dob ;
echo text($name) . " (" . text($external_id) . ")" . "    DOB: " . $dob ;
}
?>
</span>
Expand Down Expand Up @@ -437,7 +437,8 @@ function changePageSize() {
if (($pagesize > 0) && ($pagestart > 0)) {
generatePageElement($pagestart - $pagesize, $pagesize, $billing_view, $issue, "&lArr;" . htmlspecialchars(xl("Prev"), ENT_NOQUOTES) . " ");
}
echo ($pagestart + 1) . "-" . $upper . " " . htmlspecialchars(xl('of'), ENT_NOQUOTES) . " " . $numRes;
echo (($pagesize > 0) ? ($pagestart + 1) : "1") . "-" . $upper . " " . htmlspecialchars(xl('of'), ENT_NOQUOTES) . " " . $numRes;

if (($pagesize > 0) && ($pagestart + $pagesize <= $numRes)) {
generatePageElement($pagestart + $pagesize, $pagesize, $billing_view, $issue, " " . htmlspecialchars(xl("Next"), ENT_NOQUOTES) . "&rArr;");
}
Expand Down
Loading