24.3 fb water system changes #722
Conversation
* 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>
…eduled after the animal dies
…mounts after an animal is marked as death.
…er amounts that are in the future when animals get switch to lixit.
…te for the report. Adding a height for Water Grid Calendar.
…le. Switching the reportStartDate to 1947-02-10
…nt side for provide fruit.
|
WARNING: This PR appears to have the default title generated by GitHub. Please use something more descriptive. |
There was a problem hiding this comment.
If I do end and start new water order, then in the new water order form I choose lixit. It will give the error:
Row 1, Water Volume (mL): ERROR: Volume should be blank when selecting Lixit/Ad Lib for Water Source
Even though volume is blank. It doesn’t show an error for Frequency needing to be Daily-Anytime. If I change Frequency to Daily-Anytime. Then the volume error goes away. I think it’s using the volume error as the frequency error as well.
If I change a water order to lixit by selecting end and start new water order some days are color coded saying on Lixit. The day I selected to change stays as that original water amount and color code. The day after is on Lixit color coded. The rest are white, ID in picture (r11038)
If I change the water order from the data entry page without going through the water calendar select and end new water order. The first day is color coded with on Lixit. The rest are white as supposed to be. ID in picture (r06011)
If I do end and start new water order for a reoccurring order for Monday. Then in the form that pops up I close and don’t submit. It will create a new water order for that next week monday, If I then change to lixit in another water order form, it will create duplicates for that ID on that day I selected for the end and start new water order. One will be the original and one will be the lixit. ID in picture (r05056)
WNPRC_EHR/resources/web/wnprc_ehr/ext4/data/SingleAnimal/WaterStoreCollection.js
Outdated
Show resolved
Hide resolved
…ering a new water order.
Rationale
Multiple fixes to the water monitoring system such as:
Related Pull Requests
none
Changes
several changes to the water code