Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -1842,13 +1842,13 @@ else if (aliquotedFromObj instanceof Number)
// Failed to generate a name due to some part of the expression not in the row
String rowText = _context.isCrossFolderImport() || _context.isCrossTypeImport() ? "" : " on row " + e.getRowNumber();
if (isAliquot)
addRowError("Failed to generate name for aliquot " + rowText + " using aliquot naming pattern " + _sampleType.getAliquotNameExpression() + ". Check the syntax of the aliquot naming pattern and the data values for the aliquot.");
addRowError("Failed to generate name for aliquot" + rowText + " using aliquot naming pattern " + _sampleType.getAliquotNameExpression() + ". Check the syntax of the aliquot naming pattern and the data values for the aliquot.");
else if (_sampleType.hasNameExpression())
addRowError("Failed to generate name for sample " + rowText + " using naming pattern " + _sampleType.getNameExpression() + ". Check the syntax of the naming pattern and the data values for the sample.");
addRowError("Failed to generate name for sample" + rowText + " using naming pattern " + _sampleType.getNameExpression() + ". Check the syntax of the naming pattern and the data values for the sample.");
else if (_sampleType.hasNameAsIdCol())
addRowError("SampleID or Name is required for sample " + rowText + ".");
addRowError("SampleID or Name is required for sample" + rowText + ".");
else
addRowError("All id columns are required for sample " + rowText + ".");
addRowError("All id columns are required for sample" + rowText + ".");
}
}

Expand Down