Skip to content

Medications hotfix package#200

Merged
warrendennis merged 16 commits intoopen-osp:mainfrom
openo-beta:medications-hotfix-package
Mar 9, 2026
Merged

Medications hotfix package#200
warrendennis merged 16 commits intoopen-osp:mainfrom
openo-beta:medications-hotfix-package

Conversation

@lacarmen
Copy link
Copy Markdown
Contributor

@lacarmen lacarmen commented Feb 11, 2026

Background

This branch (medications-hotfix-package) builds on top of PR #188 and includes 5 medication-specific bug fixes and UI improvements.

These medication-related changes have been packaged separately from the main hotfix package PR #199 to minimize merge conflicts with ongoing medications module development work from OpenOSP.

Individual PRs in medications-hotfix-package (beyond PR #188)

1. PR #1924 - Fix invisible "Edit List" link and improve layout of drug search interface (2 commits)

  • Changed pharmacy "Edit List" link color from white to blue (#0000FF) with underline decoration to make it visible against light backgrounds
  • Aligned "Drug Name:" label inline with search textbox using flexbox layout (display: flex, align-items: center)
  • Added black border (1px solid #000) to drug search input for better visual definition
  • Applied consistent spacing with 8px gap between label and input field
  • Added CSRF protection to prescription search form in SearchDrug3.jsp

Related Issue: #1914

2. PR #2105 - Fix: missing ":" seperator for Tel in Rx printout (1 commit)

  • Fixed missing colon separator for telephone field in prescription print output
  • Ensures consistent formatting across all prescription JSP sections

Related Issue: #2098

3. PR #2171 - Fix: 404 error when clicking on the red asterisk in the Rx Medications tab (1 commit)

  • Resolved 404 error when clicking the red asterisk indicator in the Rx Medications tab
  • Ensures proper navigation and functionality for prescription warnings

Related Issue: #2100

4. PR #2180 - Fix: Class cast exception search button in the Medications tab, console error when clicking the legacy reset button (4 commits)

  • Changed type cast to valueOf call to prevent ClassCastException
  • Added name attribute for form to allow JS code to work correctly on legacy search page
  • Added null checks to ensure same functionality as type casting (returns null if no value found, not string "null")
  • Added explanatory comments documenting the change

Related Issue: #2222

5. PR #2226 - Fix "Special Instructions" box hiding the Qty/Mitte and Repeats fields, improve field alignment (2 commits)

  • Fixed misaligned form fields in prescription writing interface
  • Replaced float-based layout with modern flexbox for consistent label widths and proper field alignment
  • Added OWASP encoding to prescription form drug name fields for security

Related Issue: #2217


Summary Statistics:

  • Total unique commits: 10
  • Total branches merged: 5

D3V41 and others added 15 commits January 23, 2026 23:13
…) with underline decoration to make it visible against light backgrounds

- Aligned "Drug Name:" label inline with search textbox using flexbox layout (display: flex, align-items: center)
- Added black border (1px solid #000) to drug search input for better visual definition
- Applied consistent spacing with 8px gap between label and input field
…casting exists, null if no value is found not a string with the value of null
…lacing float-based layout with modern flexbox, ensuring consistent label widths and proper field alignment.
Applied Encode.forHtmlAttribute() and Encode.forJavaScript() to ATC, ATCcode,
and drugName variables in prescribe.jsp lines 247-252 to prevent XSS vulnerabilities.

- Encoded ATC in label title attribute
- Encoded ATCcode in hidden input value
- Encoded drugName in value attributes, JavaScript function calls, and TITLE attribute
- Preserved all element IDs and event handlers

Co-authored-by: Deval Italiya <D3V41@users.noreply.github.com>
…rch-button-rx' into medications-hotfix-package
@warrendennis warrendennis merged commit fb049a1 into open-osp:main Mar 9, 2026
11 checks passed
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.

4 participants