Skip to content

Commit ceffad5

Browse files
Add ability to filter the sample lineage graph by status (#7773)
1 parent 7c1cdce commit ceffad5

3 files changed

Lines changed: 5 additions & 0 deletions

File tree

api/src/org/labkey/api/exp/api/ExpMaterial.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public interface ExpMaterial extends ExpRunItem
5757

5858
void setAliquotedFromLSID(String lsid);
5959

60+
Long getSampleStateId();
61+
6062
DataState getSampleState();
6163

6264
String getStateLabel();

api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ public static JSONObject serializeMaterial(@NotNull ExpMaterial material, @Nulla
754754
isDerivative = material.getRunId() != null && material.getRunId() > 0;
755755

756756
jsonObject.put("materialLineageType", isAliquot ? "Aliquot" : (isDerivative ? "Derivative" : "RootMaterial"));
757+
if (material.getSampleStateId() != null)
758+
jsonObject.put("sampleStatus", material.getSampleStateId());
757759

758760
return jsonObject;
759761
}

experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ public void setAliquotedFromLSID(String lsid)
179179
_object.setAliquotedFromLSID(lsid);
180180
}
181181

182+
@Override
182183
public Long getSampleStateId()
183184
{
184185
return _object.getSampleState();

0 commit comments

Comments
 (0)