diff --git a/api/src/org/labkey/api/exp/api/ExpMaterial.java b/api/src/org/labkey/api/exp/api/ExpMaterial.java index 768a7e17f37..26ac0c41810 100644 --- a/api/src/org/labkey/api/exp/api/ExpMaterial.java +++ b/api/src/org/labkey/api/exp/api/ExpMaterial.java @@ -57,6 +57,8 @@ public interface ExpMaterial extends ExpRunItem void setAliquotedFromLSID(String lsid); + Long getSampleStateId(); + DataState getSampleState(); String getStateLabel(); diff --git a/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java b/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java index c56d4467067..bb79fa4b0a6 100644 --- a/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java +++ b/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java @@ -754,6 +754,8 @@ public static JSONObject serializeMaterial(@NotNull ExpMaterial material, @Nulla isDerivative = material.getRunId() != null && material.getRunId() > 0; jsonObject.put("materialLineageType", isAliquot ? "Aliquot" : (isDerivative ? "Derivative" : "RootMaterial")); + if (material.getSampleStateId() != null) + jsonObject.put("sampleStatus", material.getSampleStateId()); return jsonObject; } diff --git a/experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java b/experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java index b4b8581656a..3799d5c8713 100644 --- a/experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java @@ -179,6 +179,7 @@ public void setAliquotedFromLSID(String lsid) _object.setAliquotedFromLSID(lsid); } + @Override public Long getSampleStateId() { return _object.getSampleState();