Merge 24.11 to 25.3

Author: labkey-teamcity

WNPRC_EHR/resources/queries/study/currentBloodDraws.query.xml

@@ -83,14 +83,6 @@
                         <columnTitle>Volume Remaining After All Draws (mL)</columnTitle>
                         <url>/WNPRC/EHR/ehr-animalHistory.view#subjects:${Id}&amp;inputType:singleSubject&amp;showReport:1&amp;activeReport:BloodSummary</url>
                         <description>This column shows the amount of blood remaining for the animal while considering future draws. It includes approved blood draws 30 days into the future and past blood draws 30 days in the past.</description>
-                        <conditionalFormats>
-                            <conditionalFormat>
-                                <filters>
-                                    <filter operator="lt" value="0"/>
-                                </filters>
-                                <backgroundColor>FF0000</backgroundColor>
-                            </conditionalFormat>
-                        </conditionalFormats>
                     </column>
                 </columns>
             </table>

WNPRC_EHR/resources/views/gestation_calculator.html

@@ -71,7 +71,8 @@
             });
         }
 
-        function calculateGestationDays() {
+        function calculateGestationDays(e) {
+            e.preventDefault();
             let species = document.getElementById("species_input").value;
             LABKEY.Query.selectRows({
                 schemaName: 'wnprc',