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

Patch1 more cherry-picks #7457

Merged
merged 8 commits into from
May 27, 2024
Merged

Patch1 more cherry-picks #7457

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6bccd1
Phantom date showing at the top of all reports. (#7433)
juggernautsei May 26, 2024
64f97f7
Added fix for zip bomb (#7407)
tanmaypardeshi May 26, 2024
4d14781
escape strings - brady's comment on pr #7359 (#7400)
ruthkonyn May 26, 2024
4c5515d
Fix: to not allow user to pick future date for DOB (#7379)
riyagori1203 May 26, 2024
6aa8043
Weno changes from documentation critique (#7453)
sjpadgett May 26, 2024
731c6c8
Visit history - correct count for displaying ALL results on a page (#…
ruthkonyn May 26, 2024
7086c96
Fix: delete entry in immunization (#7346)
sathiya06 May 26, 2024
532dd8f
fix: use getTimeFormat for encounter date of service datetime picker …
stephenwaite May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
Phantom date showing at the top of all reports. (#7433) 
* Phantom date showing at the top of all reports.

* PSR %$^&*(

(cherry picked from commit 57973a2)
  • Loading branch information
@juggernautsei @sjpadgett
juggernautsei authored and sjpadgett committed May 26, 2024
commit a6bccd1e68c680883a9b3356c37fdbac85ee9097
5 changes: 3 additions & 2 deletions interface/patient_file/report/custom_report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,9 +782,10 @@ function zip_content($source, $destination, $content = '', $create = true)
echo "<div class='text encounter_form'>";
echo "<h4>" . text(xl_form_title($formres["form_name"])) . "</h4>";
}

if (!empty($dateres['date'])) {
// show the encounter's date
echo "(" . text(oeFormatSDFT(strtotime($dateres["date"]))) . ") ";
echo "(" . text(oeFormatSDFT(strtotime($dateres["date"]))) . ") ";
}
if ($res[1] == 'newpatient') {
// display the provider info
echo ' ' . xlt('Provider') . ': ' . text(getProviderName(getProviderIdOfEncounter($form_encounter)));
Expand Down