Skip to content
Merged
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
1 change: 1 addition & 0 deletions api/src/org/labkey/api/exp/query/ExpMaterialTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ enum Column
Inputs,
IsAliquot,
IsPlated,
LastIndexed,
LSID,
MaterialExpDate,
MaterialSourceId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ public MutableColumnInfo createColumn(String alias, Column column)
append(ExperimentServiceImpl.get().getTinfoDataIndexed(), "di").
append(" WHERE di.DataId = ").
append(ExprColumn.STR_TABLE_ALIAS).append(".RowId)");
var lastIndexed = new ExprColumn(this, "LastIndexed", lastIndexedSql, JdbcType.TIMESTAMP);
var lastIndexed = new ExprColumn(this, Column.LastIndexed.name(), lastIndexedSql, JdbcType.TIMESTAMP);
lastIndexed.setDescription("Date when the data was last full-text search indexed in the system");
lastIndexed.setHidden(true);
lastIndexed.setReadOnly(true);
lastIndexed.setUserEditable(false);
return lastIndexed;
case DataClass:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
import static org.labkey.api.exp.query.ExpMaterialTable.Column.AliquotVolume;
import static org.labkey.api.exp.query.ExpMaterialTable.Column.AvailableAliquotCount;
import static org.labkey.api.exp.query.ExpMaterialTable.Column.AvailableAliquotVolume;
import static org.labkey.api.exp.query.ExpMaterialTable.Column.LastIndexed;
import static org.labkey.api.exp.query.ExpMaterialTable.Column.StoredAmount;
import static org.labkey.api.exp.query.ExpMaterialTable.Column.Units;
import static org.labkey.api.util.StringExpressionFactory.AbstractStringExpression.NullValueBehavior.NullResult;
Expand Down Expand Up @@ -577,6 +578,18 @@ public StringExpression getURL(ColumnInfo parent)
ret.setShownInUpdateView(true);
return ret;
}
case LastIndexed ->
{
var sql = new SQLFragment("(SELECT LastIndexed FROM ")
.append(ExperimentServiceImpl.get().getTinfoMaterialIndexed(), "mi")
.append(" WHERE mi.MaterialId = ").append(ExprColumn.STR_TABLE_ALIAS).append(".RowId)");
var ret = new ExprColumn(this, LastIndexed.name(), sql, JdbcType.TIMESTAMP);
ret.setDescription("Date when the material was last full-text search indexed in the system");
ret.setHidden(true);
ret.setReadOnly(true);
ret.setUserEditable(false);
return ret;
}
default -> throw new IllegalArgumentException("Unknown column " + column);
}
}
Expand Down Expand Up @@ -903,7 +916,7 @@ public void addQueryFieldKeys(Set<FieldKey> keys)
addColumn(col);

addVocabularyDomains();

addColumn(LastIndexed);
addColumn(Column.Properties);

var colInputs = addColumn(Column.Inputs);
Expand Down