Skip to content

Animal age update #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kollil merged 1 commit into from
Feb 11, 2026
Merged

Animal age update #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="AssignmentPoolUnderTheAge" tableDbType="TABLE">
<tableTitle>Animals under the age of 2.5 with an assignment pool note</tableTitle>
<tableTitle>Animals under the age of 3 with an assignment pool note</tableTitle>
</table>
</tables>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ SELECT

FROM Assignment a
WHERE
a.Id.Age.ageinyears <= 2.5
a.Id.Age.ageinyears <= 3
AND a.project.displayname NOT IN ('0492-02', '0492-03')
AND a.Id.demographics.species = 'Rhesus Macaque'
AND EXISTS (
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="AssignmentsUnderTheAge" tableDbType="TABLE">
<tableTitle>Animals under the age of 2.5 with an active assignment</tableTitle>
<tableTitle>Animals under the age of 3 with an active assignment</tableTitle>
</table>
</tables>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

FROM Assignment a
WHERE
a.Id.Age.ageinyears <= 2.5
a.Id.Age.ageinyears <= 3
AND a.Id.demographics.species = 'Rhesus Macaque'
AND a.enddate IS NULL
AND a.isActive = 1
Expand Down
9 changes: 5 additions & 4 deletions onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public String getMessageBodyHTML(Container c, User u)
The grid should include:
- 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.
- Animals under the age of 2.5 with an "Assignment pool" note in PRIMe (under general>notes)
- 2/11/26 - change the age animals under 3 years old
*/
private void activeAssignmentsUnderTheAge(final Container c, User u, final StringBuilder msg)
{
Expand All @@ -148,13 +149,13 @@ private void activeAssignmentsUnderTheAge(final Container c, User u, final Strin

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

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

if (total > 0)
{
msg.append("<b>Animals under the age of 2.5 with \"Assignment pool\" notes:</b><p>");
msg.append("<b>Animals under the age of 3 with \"Assignment pool\" notes:</b><p>");
msg.append( total + " entries found. ");
msg.append("<a href='" + getExecuteQueryUrl(c, "study", "AssignmentPoolUnderTheAge", null) + "'>Click here to view them</a>\n");
msg.append("<hr>\n\n");
}
else {
msg.append("<b>WARNING: No animals under the age of 2.5 with an \"Assignment pool\" notes!</b><br><hr>\n");
msg.append("<b>WARNING: No animals under the age of 3 with an \"Assignment pool\" notes!</b><br><hr>\n");
}
}

Expand Down