From f87b96833a6eafb936548739ce6002ca2920957a Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 15:17:28 -0700 Subject: [PATCH 1/4] Remove commons-math3 from :server:modules:platform:api --- Viral_Load_Assay/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/Viral_Load_Assay/build.gradle b/Viral_Load_Assay/build.gradle index 848d92a2f..17d617b4a 100644 --- a/Viral_Load_Assay/build.gradle +++ b/Viral_Load_Assay/build.gradle @@ -1,6 +1,7 @@ import org.labkey.gradle.util.BuildUtils; dependencies { + external "org.apache.commons:commons-math3:${commonsMath3Version}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile") } From 48a657aa596c37655e4f6ac990dbb97f122ee45f Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 8 Sep 2020 06:33:01 -0700 Subject: [PATCH 2/4] Use jetbrains Nullable instead of javax.annotation --- .../api/ehr/dataentry/DefaultDataEntryFormFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java index a9fa61db2..e4c06e657 100644 --- a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java +++ b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java @@ -18,9 +18,9 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.labkey.api.module.Module; -import javax.annotation.Nullable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -42,7 +42,8 @@ public DefaultDataEntryFormFactory(@NotNull Class clazz _module = module; } - @Nullable @Override + @Nullable + @Override public DataEntryForm createForm(DataEntryFormContext ctx) { try From 197f3528f21f6041717a48abd62cd701cb8e2a60 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 13:17:35 -0700 Subject: [PATCH 3/4] Align jars.txt with dependency declarations --- Viral_Load_Assay/resources/credits/jars.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Viral_Load_Assay/resources/credits/jars.txt diff --git a/Viral_Load_Assay/resources/credits/jars.txt b/Viral_Load_Assay/resources/credits/jars.txt new file mode 100644 index 000000000..a401aa5a9 --- /dev/null +++ b/Viral_Load_Assay/resources/credits/jars.txt @@ -0,0 +1,4 @@ +{table} +Filename|Component|Version|Source|License|Purpose +commons-math3-3.6.1.jar|Commons Math|3.6.1|{link:Apache|http://commons.apache.org/math/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|Lightweight, self-contained mathematics and statistics components +{table} From 273b1d8e8d8f38216aa5077b7e29c92525c4cc58 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 18 Sep 2020 10:42:28 -0700 Subject: [PATCH 4/4] Remove duplicate tomorrow --- ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java b/ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java index a3ba39673..5bb4022bd 100644 --- a/ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java +++ b/ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java @@ -2189,8 +2189,6 @@ public void testNecropsyRequestFlow() setNecropsyFormElement("chargetype", chargeType); _ext4Helper.selectComboBoxItem("Procedure:", Ext4Helper.TextMatchTechnique.CONTAINS, procedureid); - LocalDateTime tomorrow = now.plus(1, ChronoUnit.DAYS); - log("Entering values for Tissue Samples"); Ext4GridRef grid = _helper.getExt4GridForFormSection("Tissue Samples"); _helper.addRecordToGrid(grid);