Skip to content

Commit 3a7b6a7

Browse files
Merge 24.11 to 25.3
2 parents 87494af + 267af34 commit 3a7b6a7

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ private void getFoodDeprivesTodayAnimalUnassigned() {
14691469

14701470
// Filters data.
14711471
for (HashMap<String, String> result : unfilteredReturnArray) {
1472-
if (result.get("Id/activeAssignments/projects").contains(result.get("project"))) {
1472+
if (!result.get("Id/activeAssignments/projects").contains(result.get("project"))) {
14731473
filteredReturnArray.add(result);
14741474
}
14751475
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
In the event of an injury or potential exposure occurring on the weekend that requires a trip the UW Hospital Emergency
120120
Department, contact<br>either the Colony Management Supervisor or the Veterinarian on-call, and they will contact the
121121
appropriate HR representative.
122+
<br>
123+
<b style='color:red;'>NOTE: HR contacts should be used only for emergencies during non-business hours.</b>
122124
<br><br>
123125
</div>
124126
</div>

0 commit comments

Comments
 (0)