Skip to content

Commit 3c3bb64

Browse files
authored
Changed the animal age to under 3 instead 2.5 years (#1635)
1 parent 801333e commit 3c3bb64

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<tables xmlns="http://labkey.org/data/xml">
55
<table tableName="AssignmentPoolUnderTheAge" tableDbType="TABLE">
6-
<tableTitle>Animals under the age of 2.5 with an assignment pool note</tableTitle>
6+
<tableTitle>Animals under the age of 3 with an assignment pool note</tableTitle>
77
</table>
88
</tables>
99
</metadata>

onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ SELECT
4242

4343
FROM Assignment a
4444
WHERE
45-
a.Id.Age.ageinyears <= 2.5
45+
a.Id.Age.ageinyears <= 3
4646
AND a.project.displayname NOT IN ('0492-02', '0492-03')
4747
AND a.Id.demographics.species = 'Rhesus Macaque'
4848
AND EXISTS (

onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<tables xmlns="http://labkey.org/data/xml">
55
<table tableName="AssignmentsUnderTheAge" tableDbType="TABLE">
6-
<tableTitle>Animals under the age of 2.5 with an active assignment</tableTitle>
6+
<tableTitle>Animals under the age of 3 with an active assignment</tableTitle>
77
</table>
88
</tables>
99
</metadata>

onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
FROM Assignment a
4545
WHERE
46-
a.Id.Age.ageinyears <= 2.5
46+
a.Id.Age.ageinyears <= 3
4747
AND a.Id.demographics.species = 'Rhesus Macaque'
4848
AND a.enddate IS NULL
4949
AND a.isActive = 1

onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ public String getMessageBodyHTML(Container c, User u)
138138
The grid should include:
139139
- Animals under the age of 2.5 with an active assignment. Exclude the U42 and U42E colony maintenance assignments, I believe the center projects for these are 0492-02 and 0492-03.
140140
- Animals under the age of 2.5 with an "Assignment pool" note in PRIMe (under general>notes)
141+
- 2/11/26 - change the age animals under 3 years old
141142
*/
142143
private void activeAssignmentsUnderTheAge(final Container c, User u, final StringBuilder msg)
143144
{
@@ -148,13 +149,13 @@ private void activeAssignmentsUnderTheAge(final Container c, User u, final Strin
148149

149150
if (total > 0)
150151
{
151-
msg.append("<b>Animals under the age of 2.5 with an active assignment excluding the U42 & U42E assignments:</b><p>");
152+
msg.append("<b>Animals under the age of 3 with an active assignment excluding the U42 & U42E assignments:</b><p>");
152153
msg.append( total + " entries found. ");
153154
msg.append("<a href='" + getExecuteQueryUrl(c, "study", "AssignmentsUnderTheAge", null) + "'>Click here to view them</a>\n");
154155
msg.append("<hr>\n\n");
155156
}
156157
else {
157-
msg.append("<b>WARNING: No animals under the age of 2.5 with an active assignment!</b><br><hr>\n");
158+
msg.append("<b>WARNING: No animals under the age of 3 with an active assignment!</b><br><hr>\n");
158159
}
159160
}
160161

@@ -167,13 +168,13 @@ private void assignmentPoolUnderTheAge(final Container c, User u, final StringBu
167168

168169
if (total > 0)
169170
{
170-
msg.append("<b>Animals under the age of 2.5 with \"Assignment pool\" notes:</b><p>");
171+
msg.append("<b>Animals under the age of 3 with \"Assignment pool\" notes:</b><p>");
171172
msg.append( total + " entries found. ");
172173
msg.append("<a href='" + getExecuteQueryUrl(c, "study", "AssignmentPoolUnderTheAge", null) + "'>Click here to view them</a>\n");
173174
msg.append("<hr>\n\n");
174175
}
175176
else {
176-
msg.append("<b>WARNING: No animals under the age of 2.5 with an \"Assignment pool\" notes!</b><br><hr>\n");
177+
msg.append("<b>WARNING: No animals under the age of 3 with an \"Assignment pool\" notes!</b><br><hr>\n");
177178
}
178179
}
179180

0 commit comments

Comments
 (0)