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.11 to 25.1 #1224

Merged
merged 8 commits into from
Jan 14, 2025
Merged

Conversation

github-actions[bot]
Copy link

Generated automatically.
Merging changes from: 01b2ad3
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=25.1_fb_bot_merge_24.11

Ohsudev and others added 8 commits December 19, 2024 11:45
#1207)

* Created scripting program to update compliance string "ARRS " to "DCM"

* Modified Compliance translation string from "arrs" to "dcm"

* Modified Compliance translation from "ARRS" to "DCM"

* Modified Compliance translation from "ARRS" to "DCM"
* allow enddate to be NULL

* replace enddateCoalesced with alternate

* fix typo

* cast enddate as DATE

* Use parallel enddate IS NULL

Adopt Ben Bimber's suggestion to modify both enddate comparisons to the same solution and use the one that is transparent about the problem being solved.

* Reformat

* Accommodate NULL treatment-order enddates

* Remove added blank lines
* Created a new probram that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Created a new program that translated the Compliance Procedure Recent.sql to a static set of data set values.

* Modified version of the Compliance Overdue/Soon Reports

* Modified Compliance query to remove sql reusltset errors

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified xml file to reflect new temp tables configurations

* Modified Compliance reporting formats.

* Modified Compliance reporting formats.

* Modified Compliance Report overdue/soon

* Modified Compliance Report overdue/soon

* Modified Compliance Report overdue/soon

* Modified Compliance Report overdue/soon

* Modified Compliance Overdue/Soon reports data type

* Modified Compliance OVerdue/Soon reports sql program.

* Modified Compliance OVerdue/Soon reports sql program.

* Modified Compliance OVerdue/Soon reports sql program.

* Modified Compliance OVerdue/Soon reports sql program.

* Modified Compliance OVerdue/Soon reports sql program.

* Modified Compliance Overdue/Soon reports queries.

* Modified Compliance Overdue/Soon reports queries.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report faster version.

* Modified Compliance Overdue/Soon report code changes.

* Modified Compliance Overdue/Soon report code changes.

* Modified Compliance Overdue/Soon reports.

* Modified Compliance Overdue/Soon reports.

* Modified Compliance Overdue/Soon reports.

* Modified Compliance Overdue/Soon reports.

* Modified Compliance Overdue/Soon reports.
# Conflicts:
#	ONPRC_EHR_ComplianceDB/resources/views/begin.html
@github-actions github-actions bot merged commit c03443e into release25.1-SNAPSHOT Jan 14, 2025
4 checks passed
@github-actions github-actions bot deleted the 25.1_fb_bot_merge_24.11 branch January 14, 2025 16:53
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