[bot] Merge 24.7 to 24.11 #734
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
* Migrating changes to water system to 24.3 (#627) * Closing water orders and breeding encounters when animal mark as dead * Fixing problem with the watertotal info panel * Fix problem with event label in calendar. * Implemented accordion for the Info Panels in the calendar. * Removing unnecesary debugger. * Fixed the asymchronos problem with fetching waterSchedule first and waterTotal second. * Improving performance for render calendar, limiting to only dates shown in the calendar view. Using waterTotalWithParameters.sql * Working for entery colony need to troubleshoot for single animal or multiple animal ids. * Fixing error with new waterTotalWithParameters when using the notification. * Improving comments regarding the parameters used in water monitoring queries * Removing death animals from water notification. * adding stringify to Json array to solve problem with saving water orders. * Remving JSON.parse * Linking chairing date to the single animal encounter form. * Requiring location on chairing dataset. * Adding validation to check Daily-PM. * Improving frequency checks for water orders. Using if statements instead of switch case. * Adding map to remove no water orders by each date on calendar. * Adding popup window for animal changing to Lixit. * Adding parameter for the full history report. Bug introduce with waterTotal query. * Defaulting StartTarget to 1947 birthdate of the oldest animal. * Fixing tab space for WNPRC_EHRModule * Temporary commit to add a new water button * 23.11 fb notifications quick fix (#621) * Added updates requested by the blood draw team. - Blood Draws Today (All): Now sorts draws by incomplete first. Also changed unassigned/incomplete column headers for clarity. - Blood Draw Review Notification (Trigger): Updated this so it only sends when a blood draw is requested for the current day with an issue. - Blood Draw Review Notification (Daily): Now shows any blood draws (today & future) that will be overdrawn. * Removed test dates and updated to correct dates. * Fixed test date updates. * Removed placeholder text. --------- Co-authored-by: aschmidt34 <124093649+aschmidt34@users.noreply.github.com> * Fixing problem with binding JSP page * Fixing title for death animals in Full calendar. * Fixing problem with branchName for the gradle build process * adding a function to remove all the future water amounts that are scheduled after the animal dies * Fix to the water total reports in animal history, removing the wateramounts after an animal is marked as death. * adding new js report for animal history. * adding close function to expedite closing water orders. * Using close water order flag to not checkwaterregulation. * fixing function to switch to lixit animals. * Deleting water orders that are start in the future, also deleting water amounts that are in the future when animals get switch to lixit. * Correcting typo on WaterCalendar.jsp * Fixing format of error message. * Fixing incomplete water treatments view. * Adding filter to show only regulated animals. * adding report for water total so it does not request start and end date for the report. Adding a height for Water Grid Calendar. * Removing file after merging husbandry reports to wnprcHusbandry.js file. Switching the reportStartDate to 1947-02-10 * Hiding watertotal from the future when a water amount or order is present. * Removing dependency for wnprcTotalWaterReport.js. * Fixing problem with water notification, adding parameters to query. * Adding water source to treatment form. * Removing on lixit from the water schedule when first order is complete it. * Fixing problem with re-rendering inside the webpart in the animal history. * Moving remarks to follow the order in .qview file * Fixing problem with zero when adding lixit into the water treatment form. * Removing not used button from DataEntryButtons.js * Adding action required to the qview to show first lixit in calendar. * Adding filter to obtain all water schedule in the future. * Multiple changes to WaterCalendar.jsp to fix problems with lixit. * Button for completing water given to have a pop up message * Switching text to submit final * Adding validations to the water orders, removing validation from client side for provide fruit. * Adding Submit Water button to the Enter Water Treatment. * Removing extra code that is no longer used. * Closing lixit order if one is open. * Triggerscript function to check if animal is on lixit * Improving formatting of WaterCalendar.jsp * fixing overlap when closing lixit. * Removing commented code. * fixing problem with lixit error and blank volume when adding a new water order. * fix of water calendar not loading on production. * fixing problem with closing water from water calendar UI and when entering a new water order. * Fix problem with going back one month in the water calendar. --------- Co-authored-by: aschmidt34 <124093649+aschmidt34@users.noreply.github.com>
cnathe
approved these changes
Jan 20, 2025
github-actions
bot
merged commit dc5efd4
into
release24.11-SNAPSHOT
5 of 6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generated automatically.
Merging changes from: 3247b0b
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=24.11_fb_bot_merge_24.7