From 812960ff75780674281431a28f59ec906ec5358d Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 22 Sep 2025 18:34:26 -0700 Subject: [PATCH 1/2] Don't crawl any study links (#1045) Add study to skip list --- .../src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java b/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java index 6543a9171..1dde7ad39 100644 --- a/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java +++ b/ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java @@ -340,7 +340,6 @@ protected List skipLinksForCrawling() "query-begin.view", "query-searchPanel.view", "query-executeQuery.view", - "study-manageStudy.view", "ehr-animalHistory.view", "ehr-updateQuery.view", "ehr-updateTable.view", @@ -354,7 +353,8 @@ protected List skipLinksForCrawling() "ldk-updateQuery", "junit-begin.view", "admin-", - "ehr-datasets.view" + "ehr-datasets.view", + "study-" // Don't crawl any study links ); } From dde3c85dc4d4a2d6e90062d358960d478e31efe2 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Fri, 26 Sep 2025 05:49:57 -0700 Subject: [PATCH 2/2] Make treatment_frequency extensible (#1047) Add LSID to ehr_lookups.treatment_frequency --- .../postgresql/ehr_lookups-25.002-25.003.sql | 1 + .../dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql | 1 + ehr/resources/schemas/ehr_lookups.xml | 11 +++++++++++ ehr/src/org/labkey/ehr/EHRModule.java | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.002-25.003.sql create mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.002-25.003.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.002-25.003.sql new file mode 100644 index 000000000..432cc1567 --- /dev/null +++ b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.002-25.003.sql @@ -0,0 +1 @@ +ALTER TABLE ehr_lookups.treatment_frequency ADD COLUMN LSID LSIDtype; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql new file mode 100644 index 000000000..2902e5370 --- /dev/null +++ b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql @@ -0,0 +1 @@ +ALTER TABLE ehr_lookups.treatment_frequency ADD Lsid LsidType null; \ No newline at end of file diff --git a/ehr/resources/schemas/ehr_lookups.xml b/ehr/resources/schemas/ehr_lookups.xml index d0afd67b4..325892de6 100644 --- a/ehr/resources/schemas/ehr_lookups.xml +++ b/ehr/resources/schemas/ehr_lookups.xml @@ -963,6 +963,17 @@ false false + + lsidtype + true + true + false + + ObjectUri + Object + exp + + diff --git a/ehr/src/org/labkey/ehr/EHRModule.java b/ehr/src/org/labkey/ehr/EHRModule.java index b63580d1e..275f1ede6 100644 --- a/ehr/src/org/labkey/ehr/EHRModule.java +++ b/ehr/src/org/labkey/ehr/EHRModule.java @@ -133,7 +133,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 25.002; + return 25.003; } @Override