Merge 24.7 to 24.11

LabKey · Nov 25, 2024 · ea0f3a2 · ea0f3a2
2 parents 10f8cd4 + 6bea191
commit ea0f3a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/ehr/resources/pipeline/install.r b/ehr/resources/pipeline/install.r
@@ -5,4 +5,4 @@
 ##
 
 #installs required packages for populateKinship.r
-install.packages("kinship2", "Rlabkey", "getopt", "Matrix", "pedigree", dependencies=TRUE);
+install.packages(c("kinship2", "Rlabkey", "getopt", "Matrix", "pedigree"), dependencies=TRUE);
diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsImportTask.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsImportTask.java
@@ -306,13 +306,13 @@ else if (kinshipTable.getSqlDialect().isPostgreSQL())
 
                     if (lineNum % 250000 == 0)
                     {
-                        log.info("imported " + lineNum + " rows");
+                        log.info("imported " + String.format("%,d", lineNum) + " rows");
                     }
                 }
 
                 stmt.executeBatch();
                 transaction.commit();
-                log.info("Inserted " + lineNum + " rows into ehr.kinship");
+                log.info("Inserted " + String.format("%,d", lineNum) + " rows into ehr.kinship");
             }
         }
         catch (RuntimeSQLException | SQLException | IOException e)
@@ -705,7 +705,7 @@ private static void processInbreeding(Container c, User u, File pipelineDir, Log
 
                 transaction.commit();
             }
-            log.info("Inserted " + lineNum + " rows into inbreeding coefficients table");
+            log.info("Inserted " + String.format("%,d", lineNum) + " rows into inbreeding coefficients table");
 
         }
         catch (DuplicateKeyException | SQLException | IOException | QueryUpdateServiceException e)

diff --git a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java
@@ -111,12 +111,11 @@ public void clickManuallyTriggerEmail(String name)
 
     public void addManageUsers(String notification, String user)
     {
-        log("Adding " + user + "to" + notification);
-        notification = notification.replace(" ", "");
-        notification = "manageUser_" + notification;
-        clickAndWait(Locator.tagWithAttributeContaining("a", "id", notification).withText("Manage Subscribed Users/Groups"), 0);
+        log("Adding " + user + " to" + notification);
+        notification = "manageUser_" +  notification.replace(" ", "");
+        Locator notificationLoc = Locator.tagWithAttributeContaining("a", "id", notification).withText("Manage Subscribed Users/Groups");
+        scrollIntoView(waitForElement(notificationLoc)).click();
         _ext4Helper.selectComboBoxItem("Add User Or Group:", user);
         clickButton("Close", 0);
-
     }
 }