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

[bot] Merge 24.12 to develop #709

Merged
merged 5 commits into from
Dec 11, 2024
Merged

[bot] Merge 24.12 to develop #709

merged 5 commits into from
Dec 11, 2024

Conversation

github-actions[bot]
Copy link

Generated automatically.
Merging changes from: 95ee850
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_24.12

csebranek and others added 5 commits December 4, 2024 16:02
* Add blood graph along with queries to support it, as well as new column for blood avail including thirty days in the future

* exclude today for next 30 days calculation of blood, fix blood summary calc, adjust labels

* use next 30 days since it does not include today

* use ehr version

* remove wnprc blood graph to use ehr instead

* Consolidate blood draw reports into currentBloodDraws.sql, adjust references

* ignore project type

* group up the blood draws if they are done at the same time

* Revert back to original AvailBlood calculation, add new calc for future draws in the new current blood report, fix ehr blood store so all records in transaction are used

* update notification to revert to old blood avail name, use species as lookups for blood queries

* restore demographicsBloodSummary query file

* update test comments

* restore old blood draw query

---------

Co-authored-by: Marty Pradere <[email protected]>
@github-actions github-actions bot merged commit 41f7769 into develop Dec 11, 2024
3 of 4 checks passed
@github-actions github-actions bot deleted the fb_bot_merge_24.12 branch December 11, 2024 17:56
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.

3 participants