Merge 26.2 to develop

Author: labkey-teamcity

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);

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>

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 (

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>

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

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");
         }
     }
 

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);