From 1f7bb9474ffb2ff5318f9935aa6d60582a61b23a Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 2 Dec 2025 18:36:40 -0800 Subject: [PATCH 1/6] bug fixes and test updates --- .../experiment/InventoryMetricUnit.java | 49 +++++++++++++++++++ .../experiment/InventoryMetricUnitKind.java | 9 ++++ 2 files changed, 58 insertions(+) create mode 100644 src/org/labkey/test/params/experiment/InventoryMetricUnitKind.java diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index d87a7242cd..ad59435f4d 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -2,6 +2,10 @@ import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * Enum of the various storage amount types. */ @@ -11,6 +15,9 @@ public enum InventoryMetricUnit G("g", "g (grams)"), MG("mg", "mg (milligrams)"), KG("kg", "kg (kilograms)"), + UG("ug", "ug (micrograms)"), + NG("ng", "ng (nanograms)"), + PG("pg", "pg (picograms)"), ML("mL", "mL (milliliters)"), UL("uL", "uL (microliters)"), L("L", "L (liters)"), @@ -47,4 +54,46 @@ public static String getStandardUnit(String unitString) } return unitString; } + + public static List getAllSampleTypeUnits() + { + return Arrays.asList(InventoryMetricUnit.G, InventoryMetricUnit.MG, InventoryMetricUnit.KG, + InventoryMetricUnit.UG, InventoryMetricUnit.NG, InventoryMetricUnit.PG, + InventoryMetricUnit.ML, InventoryMetricUnit.UL, InventoryMetricUnit.L, + InventoryMetricUnit.UNIT); + } + + public static List getAllSampleTypeUnitNames() + { + return getAllSampleTypeUnits().stream().map(InventoryMetricUnit::getValue).toList(); + } + + public static List getAllSampleTypeUnitLabels() + { + return getAllSampleTypeUnits().stream().map(InventoryMetricUnit::getLabel).toList(); + } + + public static List getAllSampleUnits() + { + List allUnits = new ArrayList<>(); + allUnits.addAll(getAllSampleTypeUnitNames()); + allUnits.addAll(Arrays.asList("blocks", "bottle", "box", "cells", "kit", "pack", "pcs", "slides", "tests")); + return allUnits; + } + + public static List getMassSampleUnits() + { + return Arrays.asList(InventoryMetricUnit.G, InventoryMetricUnit.MG, InventoryMetricUnit.KG, + InventoryMetricUnit.UG, InventoryMetricUnit.NG, InventoryMetricUnit.PG); + } + + public static List getMassSampleUnitNames() + { + return getMassSampleUnits().stream().map(InventoryMetricUnit::getValue).toList(); + } + + public static List getMassSampleUnitLabels() + { + return getMassSampleUnits().stream().map(InventoryMetricUnit::getLabel).toList(); + } } diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnitKind.java b/src/org/labkey/test/params/experiment/InventoryMetricUnitKind.java new file mode 100644 index 0000000000..ee8dbbe02d --- /dev/null +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnitKind.java @@ -0,0 +1,9 @@ +package org.labkey.test.params.experiment; + +public enum InventoryMetricUnitKind +{ + Any, + Mass, + Volume, + Other +} From 311a35b3fb6731aade7b8843e9ef8ef06f5f0672 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 3 Dec 2025 09:26:33 -0800 Subject: [PATCH 2/6] fix tests --- .../labkey/test/params/experiment/InventoryMetricUnit.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index ad59435f4d..0aafea37d7 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -81,6 +81,11 @@ public static List getAllSampleUnits() return allUnits; } + public static List getAllCountUnits() + { + return Arrays.asList("unit", "blocks", "bottle", "box", "cells", "kit", "pack", "pcs", "slides", "tests"); + } + public static List getMassSampleUnits() { return Arrays.asList(InventoryMetricUnit.G, InventoryMetricUnit.MG, InventoryMetricUnit.KG, From 97ff4274714e4a86960c6351c79301d71b80fe0e Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 3 Dec 2025 14:36:56 -0800 Subject: [PATCH 3/6] remove support for pg unit --- .../labkey/test/params/experiment/InventoryMetricUnit.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index 0aafea37d7..af7fa082c2 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -17,7 +17,6 @@ public enum InventoryMetricUnit KG("kg", "kg (kilograms)"), UG("ug", "ug (micrograms)"), NG("ng", "ng (nanograms)"), - PG("pg", "pg (picograms)"), ML("mL", "mL (milliliters)"), UL("uL", "uL (microliters)"), L("L", "L (liters)"), @@ -58,7 +57,7 @@ public static String getStandardUnit(String unitString) public static List getAllSampleTypeUnits() { return Arrays.asList(InventoryMetricUnit.G, InventoryMetricUnit.MG, InventoryMetricUnit.KG, - InventoryMetricUnit.UG, InventoryMetricUnit.NG, InventoryMetricUnit.PG, + InventoryMetricUnit.UG, InventoryMetricUnit.NG, InventoryMetricUnit.ML, InventoryMetricUnit.UL, InventoryMetricUnit.L, InventoryMetricUnit.UNIT); } @@ -89,7 +88,7 @@ public static List getAllCountUnits() public static List getMassSampleUnits() { return Arrays.asList(InventoryMetricUnit.G, InventoryMetricUnit.MG, InventoryMetricUnit.KG, - InventoryMetricUnit.UG, InventoryMetricUnit.NG, InventoryMetricUnit.PG); + InventoryMetricUnit.UG, InventoryMetricUnit.NG); } public static List getMassSampleUnitNames() From 0b7197395c383c2bbeb2f55701633d0230c5174a Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 4 Dec 2025 21:19:50 -0800 Subject: [PATCH 4/6] bug fixes --- .../test/params/experiment/InventoryMetricUnit.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index af7fa082c2..ce99a18d1f 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -74,15 +74,15 @@ public static List getAllSampleTypeUnitLabels() public static List getAllSampleUnits() { - List allUnits = new ArrayList<>(); - allUnits.addAll(getAllSampleTypeUnitNames()); - allUnits.addAll(Arrays.asList("blocks", "bottle", "box", "cells", "kit", "pack", "pcs", "slides", "tests")); + List allUnits = new ArrayList<>(getAllSampleTypeUnitNames()); + allUnits.remove(InventoryMetricUnit.UNIT.name()); + allUnits.addAll(getAllCountUnits()); return allUnits; } public static List getAllCountUnits() { - return Arrays.asList("unit", "blocks", "bottle", "box", "cells", "kit", "pack", "pcs", "slides", "tests"); + return Arrays.asList("blocks", "bottles", "boxes", "cells", "kits", "packs", "pieces", "slides", "tests", "units"); } public static List getMassSampleUnits() From 106ab89248010cecd38a499c738ddd1d6d6a286a Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 5 Dec 2025 14:08:19 -0800 Subject: [PATCH 5/6] fix updating other unit from sample detail panel --- src/org/labkey/test/params/experiment/InventoryMetricUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index ce99a18d1f..a7ad273ddb 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -82,7 +82,7 @@ public static List getAllSampleUnits() public static List getAllCountUnits() { - return Arrays.asList("blocks", "bottles", "boxes", "cells", "kits", "packs", "pieces", "slides", "tests", "units"); + return Arrays.asList("blocks", "bottles", "boxes", "cells", "kits", "packs", "pieces", "slides", "tests", "unit"); } public static List getMassSampleUnits() From 700b607bbb17e4d42973a5007984e33ed9769a89 Mon Sep 17 00:00:00 2001 From: XingY Date: Sun, 7 Dec 2025 14:20:50 -0800 Subject: [PATCH 6/6] fix more tests --- src/org/labkey/test/params/experiment/InventoryMetricUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java index a7ad273ddb..229bd3a007 100644 --- a/src/org/labkey/test/params/experiment/InventoryMetricUnit.java +++ b/src/org/labkey/test/params/experiment/InventoryMetricUnit.java @@ -75,7 +75,7 @@ public static List getAllSampleTypeUnitLabels() public static List getAllSampleUnits() { List allUnits = new ArrayList<>(getAllSampleTypeUnitNames()); - allUnits.remove(InventoryMetricUnit.UNIT.name()); + allUnits.remove(InventoryMetricUnit.UNIT.getLabel()); allUnits.addAll(getAllCountUnits()); return allUnits; }