Merge 25.4 to develop

Author: labkey-teamcity

WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/ColonyAlertsNotificationRevamp.java

@@ -1443,7 +1443,7 @@ private void getFoodDeprivesTodayAnimalUnassigned() {
 
             // Filters data.
             for (HashMap<String, String> result : unfilteredReturnArray) {
-                if (result.get("Id/activeAssignments/projects").contains(result.get("project"))) {
+                if (!result.get("Id/activeAssignments/projects").contains(result.get("project"))) {
                     filteredReturnArray.add(result);
                 }
             }

WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/calendars/OnCallCalendar.jsp

@@ -119,6 +119,8 @@
                 In the event of an injury or potential exposure occurring on the weekend that requires a trip the UW Hospital Emergency
                 Department, contact<br>either the Colony Management Supervisor or the Veterinarian on-call, and they will contact the
                 appropriate HR representative.
+                <br>
+                <b style='color:red;'>NOTE: HR contacts should be used only for emergencies during non-business hours.</b>
                 <br><br>
             </div>
         </div>