Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/org/labkey/api/exp/api/ExpMaterial.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public interface ExpMaterial extends ExpRunItem

void setAliquotedFromLSID(String lsid);

Long getSampleStateId();

DataState getSampleState();

String getStateLabel();
Expand Down
2 changes: 2 additions & 0 deletions api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public void setAliquotedFromLSID(String lsid)
_object.setAliquotedFromLSID(lsid);
}

@Override
public Long getSampleStateId()
{
return _object.getSampleState();
Expand Down