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

Merge 24.11 to 25.1 #1238

Merged
merged 9 commits into from
Jan 28, 2025
Merged

Conversation

labkey-tchad
Copy link
Member

@labkey-tchad labkey-tchad commented Jan 28, 2025

jonesgaohsu and others added 9 commits January 15, 2025 12:42
* Restructure of Feature BRanch for eIACUC to Prime

* Upd[atre of Stored Proecure to End Date Protocols

* Don't enddate protocols in approved state

This code done in a pairing session with Gary and Brent.

* Update of Stored Procedure to insure only none approved Protocols are enddated

* Created new StoreProcedure of Stored Procedure to insure only none approved Protocols are enddated

* Modification the Storedc Proec ure was missing the end statment was erroring out

* Update onprc_ehr-24.005-24.006.sql

COrrected Misspelled field name at line 44

* Update of EiACUC P{rocessing for enddate

* Update onprc_ehr-24.004-24.005.sql

Removeed withdrawn from the query where clause

* Rename .xml and change descriptions

* Updated the Stored Precedure from ALTER to CREATE

* UPdate of SQL Script to remove unwanted testing comments and reformt CTEs for Stnadarization

---------

Co-authored-by: Brent Logan <gbrentlogan@gmail.com>
* Sla weaning project.

* Added Go statement after the db tables creation

* Updated the weaning page link

* Update DB stuff

* Updated URL

* Updated db tables, stored proc

* Fixed a typo

* Added the ETL process

* Updated the sql comments

* Updated the stored proc schema to point to onprc_ehr.
Updated the ETL path accordingly

* updated ETL code

* updated ETL code - changed the cronjob time to run every 15 mins for Kati's testing

* updated ETL code

* Updated stored proc to add expected, requested dates and numordered fields.

* Update the Stored proc

* Label and headers change from "Gender" to "Sex" in SLA purchase module.

* Some more places - Label and headers change from "Gender" to "Sex" in SLA Breeding query

* Some more places - Label and headers change from "Gender" to "Sex" in SLA Breeding query

* Changed the cron time to 15 mins for testing

* Updated th stored proc

* Updated stored proc, ETL time.
Updated the the Gender to Sex in Pend orders and recieved orders screens.

* Updated stored proc, ETL time.
Updated the the Gender to Sex in Pend orders and recieved orders screens.

* Updated sql

* Removed tempweaning defintion from xml.
@labkey-tchad labkey-tchad merged commit 9245c27 into release25.1-SNAPSHOT Jan 28, 2025
5 checks passed
@labkey-tchad labkey-tchad deleted the 25.1_fb_bot_merge_24.11 branch January 28, 2025 16:58
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.

5 participants