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

Merging openemr/master beforing creating a PR #2

Merged
merged 23 commits into from
Apr 25, 2024

Conversation

tanmaypardeshi
Copy link
Owner

Fixes #

Short description of what this resolves:

Changes proposed in this pull request:

manoj-ayyappan and others added 23 commits April 15, 2024 22:17
* Fixed inadequate date time format

* Added the global parameter
* Adding log scrubbing template to mask sensitive payment details in log

Signed-off-by: Jubitta John <[email protected]>

* Fixed the php styling issue

Signed-off-by: Jubitta John <[email protected]>

* Insert operation check is moved to beginning

Signed-off-by: Jubitta John <[email protected]>

---------

Signed-off-by: Jubitta John <[email protected]>
Co-authored-by: Jubitta John <[email protected]>
* Weno fixup and credential API
- change fa font size
- prevent old styles loading

* - add acl to setup
- validate vitals for under age
- fix popup error for invalid action
- add validation and default to change events
- better validate setting requirements

* - New WenoValidate class to verift keys and user credentials
- verify and reset encryption key if needed for phamacy downloads.
- temporally chang testing URL to weno dev server until new api goes online.
- setup weno module for using upgrade in pre for auto upgrade feature.

* - update code stamdards and do a little cleanup of our utility.js
- numerous validation additions.
- add all weno required settings (weno user id, facility location id and admin credentials validation) to module setup page.

* - moved the custom modules to top of managers list. appears I have a bias!
- add a simple but useful help panel to top of list table.
- color coded module name for clarity if laminas or custom.

* - had to create a separate setup_facilities script for setup so can use when module isn't enabled.
- add a help button to MM and help_requested event listener
- refactor controller for readability
- add some security

* - fix pathing problems
- refactor reloads to replace page with new version

* - too full of myself. utility Cleanup failed.
- add new dowdlog log viewer
- fix download create directory

* - fix download won't break on duplicate key
- auto save weno id in facilities section.
- some setup refactor

* - prevent resave of demographics on dialog close

* - prevent demos from throwing warning in upgrade for old weno table population. v5.0.1 I believe.
- files clean out
- remove a chance for a race condition in background tasks

* - change and move help
- refactor to use the online api from dev api

* - refactor and consoladate weno menu from Other to Weno eRx Tools
- add Module setup and new Dowmload log viewer for admin to manage
- add traps for internet off line.
- remove unused class methods and cleanup WenoValidate class for readability.

* - combine the download facility download viewer page

* Some finishing touches
- don't expose sensitive data
- change datepicker option. though it would work in US not so muct Europe's day/m/Y

* - refactor weno_log_sync for better readability and separation of concerns. This script was driving me crazy!
- reformat various errors
- ensure we have valid credentials and encryp key for downloads. If not reset so we can complete the important initial downloads at least.
- added new info to download manager
- I don't know take a look...

* Remove unused code
Add link to modules wiki

* a couple log errors

* review

* module manager help method

* Fix log escaping

* Add exception to decryptStandard so we can tell where the heck error occurs

* no message

* Resubmit for missing yag that is not missing!

* missing return in format function. Things are disappearing in my local!

* add test pharmacies
finish coredecrypt exceptions
error messages refactors

* Main fix here is adding logic for weno test pahramcies
refactors of phamacy search and bud fix
add logic to keep weno provider ids upto date and validated.
escaping and xlating some js

* Trying out updated linting
- more global management for the module
- escaping
- pharmacy search alerts
- add additional ease of setup options to setup. User Setting for logged in admin
- had to refactor provider username to provider_email for weno legacy
- add Brady's fix in core encryption service for dynamic properties. One less thing to worry about!. clean up comments

* - more clean up. This is a very nice class.

* - move validate actions up in form.
- more fiddling around.

* - add new action for listener reset_module active when the register icon is clicked. I used to remove all DB.
- contiueing project messages and search fine tuning.
- crypto updates

* - fix edit_globals magins and padding
- more runtime safety
- review note

* Update ModuleService.php

* - reset back to dev server for testing
- format messages

* - refactor to online production API domain.
- Add new items for setup and a complete module reset
- refactore MM to separate cust and laminas section lists.
* feat: minor CryptoGen class updates

* lint fix
Fixes #7368

This is a local provider's selector widget that was used in options.inc.php. I extracted it into its own class file so I can use it in a module as well as use it in options.inc.php.

I added options to inject a static list of providers into the widget for
caching/performance reasons.  Also added option to inject the query used
to retrieve the list of providers into the widget.
This changes the getSelectFields method signature to support column and
table aliases.
* Store documents in remote cloud bucket

* Refactored to remove fiber code

* Refactored to rename class to make clear the purpose

* Generic message - remote upload completed

* Restructured the dispatch and response

* PSR Fix

* Adding document retrieval from s3 bucket

* PSR fix

* Fixed datatype

* adding attribute

* fixing type error

* Tested and working

* Name changes complete
* Created by OWASP Threat Dragon

* Created by OWASP Threat Dragon

* Adding password strength meter

* Resolving comments for Password strength meter

* Replacing xlt with xlj

* Moved Password Strength meter to utility.js and added it to user_info as well

* Resolving comments about src and bootstrap styling

---------

Co-authored-by: kmalick <[email protected]>
…addition to an optimization

The optimization both clarifies the code regarding which $reminder_due status is chosen and also minimizes the calls to reminder_results_integrate, which could get resource intensive if overuse it.
- improved handling of filters/targets for inclusion/exclusion flags, and where multiple filters/targets exist across classes of patient data
- fixing right side of target interval used for target testing at value of $dateTarget passed to test_rules_clinic() instead of a value that floats with changes to left side of the interval
- fix to divide by zero error in evaluating percent of passing rules

more details at:
#7153
#7157
#7161
…age #7270 (#7359)

* add print button and put patient's details at top of visit history page

* add comment to say it fixes issue #7270

* fix styling errors in PR

* fix styling errors in PR

* fix styling errors in PR

* Update encounters.php to handle attendant_type

attendant_type in this PR was not accounted for in the patient / dob display.

* Update encounters.php remove unused class reference

Removed unused class reference.

---------

Co-authored-by: Stephen Nielson <[email protected]>
* fix: check for empty postParseEvent

* check instance type too

* fix php warns and deprecates
…#7015)

* Patient List Creation: .=, encounters & observs.

* Patient List Creation: Fix array key errors, comms

* Patient List Creation: Fix insurance array error

* Patient List Creation: Fix missing ethnicity col

* Patient List Creation: Working CSV export

* Patient List Creation: Remove unused Lab SQL joins

* Patient List Creation: Procedures report type wip

* Patient List Creation: Date filter for all reports

* Patient List Creation: Fix proc. date filter twice

* Patient List Creation: Fix CSV-specific syntax err

* Patient List Creation: Add proc. order date

* Patient List Creation: Modular report type declars

* Patient List Creation: New headings for diag check

* Patient List Creation: Remove aggreg., new fields

* Patient List Creation: Modular access control

* Patient List Creation: Primary diagnosis readable

* Patient List Creation: Fix PHPCBF violations

* Patient List Creation: Remove stray spaces

* Patient List Creation: Easier to read PHP spacing

* Manually fix PHPCBF violations

* Patient List Creation: Rm. unused sort_cols case

* Patient List Creation: Prescriptions, fix sort/ord

* Patient List Creation: Insurance filter fixed

* Patient List Creation: Formatting and reordering

* Patient List Creation: Fully functional procedures

* Complete merge

* Fix missing CSV closer

* Fix another missing CSV closer

* Patient List Creation: Options filters, descripts.

* Disable loading icon (FIX THIS)

* Patient List Creation: CSV works with codes

* Patient List Creation: Lab Res. test, modernise

* Patient List Creation: 2+ primary diagnoses fix

* Patient List Creation: Filter by provider name

* Patient List Creation CSV: More readable code

* Patient List Creation: Lab filt., prov. list, LIKE

* Manually fix PHPCBF violations, add credit

* Use correct bracket type for all arrays

* Patient List Creation: Styling improvements

* Patient List Creation: Diag. filter+, jQ wildcards

* Patient List Creation: Proper xl/attr/text usage

* Patient List Creation: $search_options overhaul

* Patient List Creation: Condense spaces in queries

* Patient List Creation: Code readable, fix ethnic

* Fix PHPCBF violations

* Fix ethnicity query

Ethnicity was breaking for single list option ethnicity or if the
ethnicity was the first item in the list options (kinda confusing as
there are only two list options, but since people can modify this list
we want to support it).

---------

Co-authored-by: Stephen Nielson <[email protected]>
- restrict NCPDP to 7 digits per spec
* Fix input sanitation on google signin email

* ValidationUtils::isValidEmail to validate email

* Refactor email validation into js function

* Syntax fixes to js

* Revert backend changes

* Fix PHP syntax issues

* Fix PHP syntax issues
* expected at least 8 spaces, found 4

* adding attendance to encounter summary page

* PSR fixes

* fixing translation
* fix: check for empty array before looking for offsite document

* silence php warning

* Changed up event logic,fixed bugs

Instead of having the url splitting and parsing in the document class,
I pass the file path into the PatientRetrieveOffsiteDocument event and
let the module writer be responsible for parsing the url.  This ensures
that we handle any kind of url variety that is needed.

Fixed up the event dispatcher throwing an error because it wasn't even
set in the class...

Fixed the setter in the event and exposed the URL property.  No idea how
this was even working in the module.

* Bug fix prevent firing events if empty file

Made it so that if the filename is empty that the event will not be
fired.

Changed up the URL so you can get the entire URL schema (which is what I
thought was originally happening but apparently it wasn't).  This means
schemas such as s3:https:// ftp:https:// webdav:https:// etc can be handled by the class
properly.

Also changed up the event so you can get the entire saved document as an
object if additional meta information is needed by the offsite document
event handler.

---------

Co-authored-by: Stephen Nielson <[email protected]>
@tanmaypardeshi tanmaypardeshi merged commit ada7a6d into tanmaypardeshi:zip-bomb-fix Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet