From 3c3bb640f39a3d92741dd0cb4476275db2b15287 Mon Sep 17 00:00:00 2001 From: Lakshmi Kolli <69940873+kollil@users.noreply.github.com> Date: Wed, 11 Feb 2026 14:37:02 -0800 Subject: [PATCH 1/3] Changed the animal age to under 3 instead 2.5 years (#1635) --- .../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 @@ - Animals under the age of 2.5 with an assignment pool note + Animals under the age of 3 with an assignment pool note
 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 @@ - Animals under the age of 2.5 with an active assignment + Animals under the age of 3 with an active assignment
 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("Animals under the age of 2.5 with an active assignment excluding the U42 & U42E assignments:

"); + msg.append("Animals under the age of 3 with an active assignment excluding the U42 & U42E assignments:

"); msg.append( total + " entries found. "); msg.append("Click here to view them\n"); msg.append("

\n\n"); } else { - msg.append("WARNING: No animals under the age of 2.5 with an active assignment!
\n"); + msg.append("WARNING: No animals under the age of 3 with an active assignment!
\n"); } } @@ -167,13 +168,13 @@ private void assignmentPoolUnderTheAge(final Container c, User u, final StringBu if (total > 0) { - msg.append("Animals under the age of 2.5 with \"Assignment pool\" notes:

"); + msg.append("Animals under the age of 3 with \"Assignment pool\" notes:

"); msg.append( total + " entries found. "); msg.append("Click here to view them\n"); msg.append("

\n\n"); } else { - msg.append("WARNING: No animals under the age of 2.5 with an \"Assignment pool\" notes!
\n"); + msg.append("WARNING: No animals under the age of 3 with an \"Assignment pool\" notes!
\n"); } } From 65b720aacb71950fb8ba4ee5d333784b54652630 Mon Sep 17 00:00:00 2001 From: Gary Jones Date: Thu, 12 Feb 2026 10:18:53 -0700 Subject: [PATCH 2/3] Made change to Billing Customizer to format total cost as a decimal (#1630) Review and approved will deploy Tonight --- .../table/ONPRC_BillingCustomizer.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/onprc_billing/src/org/labkey/onprc_billing/table/ONPRC_BillingCustomizer.java b/onprc_billing/src/org/labkey/onprc_billing/table/ONPRC_BillingCustomizer.java index 3c678ea9d..804757c78 100644 --- a/onprc_billing/src/org/labkey/onprc_billing/table/ONPRC_BillingCustomizer.java +++ b/onprc_billing/src/org/labkey/onprc_billing/table/ONPRC_BillingCustomizer.java @@ -180,8 +180,17 @@ private void addTotalCost(AbstractTableInfo ti) if (ti.getColumn("totalCost") == null && unitCost != null && ti.getColumn("quantity") != null) { - SQLFragment sql = new SQLFragment("(" + ExprColumn.STR_TABLE_ALIAS + ".unitCost * " + ExprColumn.STR_TABLE_ALIAS + ".quantity)"); - ExprColumn totalCost = new ExprColumn(ti, "totalCost", sql, JdbcType.DOUBLE, ti.getColumn("unitCost"), ti.getColumn("quantity")); + SQLFragment sql = new SQLFragment( + "CAST(ROUND((" + ExprColumn.STR_TABLE_ALIAS + ".unitCost * " + + ExprColumn.STR_TABLE_ALIAS + ".quantity), 2) AS DECIMAL(18,2))"); + ExprColumn totalCost = new ExprColumn( + ti, + "totalCost", + sql, + JdbcType.DECIMAL, + ti.getColumn("unitCost"), + ti.getColumn("quantity") + ); totalCost.setLabel("Total Cost"); totalCost.setFormat("$###,##0.00"); ti.addColumn(totalCost); From 1d23f3307a5b694ab39740857ae8f33fd9b59396 Mon Sep 17 00:00:00 2001 From: Karl Lum Date: Mon, 16 Feb 2026 15:53:50 -0800 Subject: [PATCH 3/3] Make the search more specific (#1638) --- .../labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java index 892d4551b..7689b7356 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java @@ -288,7 +288,7 @@ public void restrictedIssueSearchTest() final String ISSUE_2 = detailsPage.getIssueId(); SearchHelper searchHelper = new SearchHelper(this); - SearchResultsPage resultsPage = searchHelper.searchFor("Restricted issue search test"); + SearchResultsPage resultsPage = searchHelper.searchFor("\"Restricted issue search test\""); // verify that we can return links even if the user doesn't have permission to view a restricted issue Assert.assertTrue("Number of search results not expected", resultsPage.getResults().size() == 2);