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 @@ -67,7 +67,7 @@ public class SampleSubmissionProcessor implements Processor {
private static final String UNKNOWN_GID = "Unknown germplasm GID";
private static final String INVALID_COLUMN = "Column must be a number between 1 and 12";
private static final String INVALID_ROW = "Row must be a letter between A and H";
private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "The sample in row %d is already in row: %s, column: %d";
private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "Plate position not unique, duplicate in row %d";
private final String referenceSource;
private final BrAPIGermplasmDAO germplasmDAO;
private final BrAPIObservationUnitDAO observationUnitDAO;
Expand Down Expand Up @@ -230,7 +230,7 @@ private boolean validRow(SampleSubmissionImport row, int rowNum, ValidationError
if (plateLayout[plateRow][plateCol] > 0) {
validationErrors.addError(rowNum,
new ValidationError(SampleSubmissionImport.Columns.ROW + "/" + SampleSubmissionImport.Columns.COLUMN,
String.format(MULTIPLE_SAMPLES_SINGLE_WELL, plateLayout[plateRow][plateCol], Character.toString('A' + plateRow), plateCol),
String.format(MULTIPLE_SAMPLES_SINGLE_WELL, plateLayout[plateRow][plateCol]),
HttpStatus.UNPROCESSABLE_ENTITY));
} else {
plateLayout[plateRow][plateCol] = rowNum;
Expand Down
Loading