From 31b162cf405d17962cb1152b01dbe641d890a7a9 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 31 Dec 2024 04:28:02 -0800
Subject: [PATCH 1/2] Bump schema versions to 25.000 (#879)

---
 EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java      | 10 ++--------
 .../labkey/ehr_purchasing/EHR_PurchasingModule.java    | 10 +---------
 ehr/src/org/labkey/ehr/EHRModule.java                  |  8 +-------
 .../src/org/labkey/ehr_billing/EHR_BillingModule.java  |  9 +--------
 4 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java b/EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java
index 28dd09a48..a178bee86 100644
--- a/EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java
+++ b/EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java
@@ -53,13 +53,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.000;
-    }
-
-    @Override
-    public boolean hasScripts()
-    {
-        return true;
+        return 25.000;
     }
 
     @Override
@@ -81,7 +75,7 @@ protected void registerSchemas()
         DefaultSchema.registerProvider(EHR_AppSchema.NAME, new DefaultSchema.SchemaProvider(this)
         {
             @Override
-            public @Nullable QuerySchema createSchema(DefaultSchema schema, Module module)
+            public @NotNull QuerySchema createSchema(DefaultSchema schema, Module module)
             {
                 return new EHR_AppUserSchema(EHR_AppSchema.NAME, null, schema.getUser(), schema.getContainer(), EHR_AppSchema.getInstance().getSchema());
             }
diff --git a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java
index 12f7fd258..ca8d903af 100644
--- a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java
+++ b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java
@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.ehr_purchasing.EHR_PurchasingDomainKind;
 import org.labkey.api.exp.property.PropertyService;
@@ -46,7 +45,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.000;
+        return 25.000;
     }
 
     @Override
@@ -85,13 +84,6 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
         });
     }
 
-    @Override
-    @NotNull
-    public Collection<String> getSummary(Container c)
-    {
-        return Collections.emptyList();
-    }
-
     @Override
     @NotNull
     public Set<String> getSchemaNames()
diff --git a/ehr/src/org/labkey/ehr/EHRModule.java b/ehr/src/org/labkey/ehr/EHRModule.java
index 25d3fa57c..9bbb864f2 100644
--- a/ehr/src/org/labkey/ehr/EHRModule.java
+++ b/ehr/src/org/labkey/ehr/EHRModule.java
@@ -133,13 +133,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.005;
-    }
-
-    @Override
-    public boolean hasScripts()
-    {
-        return true;
+        return 25.000;
     }
 
     @Override
diff --git a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
index c85ea5a33..a200f3894 100644
--- a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
+++ b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
@@ -63,7 +63,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 24.001;
+        return 25.000;
     }
 
     @Override
@@ -120,13 +120,6 @@ public void userDeletedFromSite(User user)
         });
     }
 
-    @Override
-    @NotNull
-    public Collection<String> getSummary(Container c)
-    {
-        return Collections.emptyList();
-    }
-
     @Override
     @NotNull
     public Set<String> getSchemaNames()

From 941c9d01a28b3e6545cfbbb5fa90f69a5e4987ee Mon Sep 17 00:00:00 2001
From: Sweta Jewargikar <swetaJ@labkey.com>
Date: Wed, 1 Jan 2025 22:41:09 -0800
Subject: [PATCH 2/2] Test updates (#878)

---
 ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java b/ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java
index 481f43ef6..af4bd4967 100644
--- a/ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java
+++ b/ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java
@@ -14,6 +14,7 @@ public class EHRLookupPage extends LabKeyPage<EHRLookupPage.ElementCache>
     public EHRLookupPage(WebDriverWrapper driver)
     {
         super(driver);
+        waitForPage();
     }
     public void waitForPage()
     {