From 52b0cc71f0c1adba86cb0cad3dfab330d44261f5 Mon Sep 17 00:00:00 2001
From: kollil <kollil@ohsu.edu>
Date: Wed, 11 Feb 2026 12:16:12 -0800
Subject: [PATCH] Changed the animal age to under 3 instead 2.5 years

---
 .../queries/study/AssignmentPoolUnderTheAge.query.xml    | 2 +-
 .../queries/study/AssignmentPoolUnderTheAge.sql          | 2 +-
 .../queries/study/AssignmentsUnderTheAge.query.xml       | 2 +-
 .../resources/queries/study/AssignmentsUnderTheAge.sql   | 2 +-
 .../onprc_ehr/notification/BehaviorNotification.java     | 9 +++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml b/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml
index ee363ecd0..2d839c69e 100644
--- a/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.query.xml
@@ -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>
diff --git a/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql b/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql
index bfd3899c1..da5ff511a 100644
--- a/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentPoolUnderTheAge.sql
@@ -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 (
diff --git a/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml b/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml
index 62259a6b4..9636deb96 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.query.xml
@@ -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>
diff --git a/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql b/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql
index f9405ee3a..2f5234fdb 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentsUnderTheAge.sql
@@ -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
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java
index b9d63e2a5..e2829e445 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java
@@ -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)
     {
@@ -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");
         }
     }
 
@@ -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");
         }
     }