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 @@ -214,7 +214,11 @@ public Optional<DownloadFile> generateDArTFile(Program program, UUID submissionI
columns.add(Column.builder().value(SampleSubmissionImport.Columns.TISSUE).dataType(Column.ColumnDataType.STRING).build());
columns.add(Column.builder().value(SampleSubmissionImport.Columns.COMMENTS).dataType(Column.ColumnDataType.STRING).build());

//TODO sort the samples first
//Sort samples first. May be updated to use BrAPI server sorting after cache removal changes are merged
submission.get().getSamples().sort(Comparator.comparing(BrAPISample::getPlateName)
.thenComparing(BrAPISample::getColumn)
.thenComparing(BrAPISample::getRow));

List<Map<String, Object>> rows = new ArrayList<>();
submission.get().getSamples().forEach(sample -> {
Map<String, Object> row = new HashMap<>();
Expand Down
Loading