Skip to content

Commit ef85fc9

Browse files
committed
Include jobDescription in VCF output and bugfix library export
1 parent 45862e2 commit ef85fc9

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ProcessVariantsHandler.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,15 @@ private void processFile(File input, Integer libraryId, Integer readsetId, JobCo
677677
so1.setCreated(new Date());
678678
so1.setModified(new Date());
679679
so1.setReadset(readsetId);
680-
so1.setDescription("Total samples: " + sampleCount);
680+
String description = "Total samples: " + sampleCount;
681681

682+
String extraDescription = StringUtils.trimToNull(ctx.getParams().optString("jobDescription"));
683+
if (extraDescription != null)
684+
{
685+
description = description + '\n' + extraDescription;
686+
}
687+
688+
so1.setDescription(description);
682689
_resumer.getFileManager().addSequenceOutput(so1);
683690
}
684691
}

singlecell/resources/web/singlecell/panel/LibraryExportPanel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ Ext4.define('SingleCell.panel.LibraryExportPanel', {
676676
}
677677
else if (p[1] === 'HTO') {
678678
if (includeWithData || row['hashingReadsetId/totalFiles'] === 0) {
679-
if (row['hashingReadsetId'] && row['hashingReadsetId/application'] && row['hashingReadsetId/application'].match('Cell Hashing')) {
679+
if (row['hashingReadsetId'] && row['hashingReadsetId/application'] && row['hashingReadsetId/application'].match(/Cell Hashing/i)) {
680680
sortedRows.push(Ext4.apply({targetApplication: '10x HTO', laneAssignment: (p.length > 2 ? p[2] : null), plateAlias: (p.length > 3 ? p[3] : null)}, row));
681681
found = true;
682682
return false;
@@ -685,7 +685,7 @@ Ext4.define('SingleCell.panel.LibraryExportPanel', {
685685
}
686686
else if (p[1] === 'CITE') {
687687
if (includeWithData || row['citeseqReadsetId/totalFiles'] === 0) {
688-
if (row['citeseqReadsetId'] && row['citeseqReadsetId/application'] && row['citeseqReadsetId/application'].match('CITE-Seq')) {
688+
if (row['citeseqReadsetId'] && row['citeseqReadsetId/application'] && row['citeseqReadsetId/application'].match(/CITE-Seq/i)) {
689689
sortedRows.push(Ext4.apply({targetApplication: '10x CITE-Seq', laneAssignment: (p.length > 2 ? p[2] : null), plateAlias: (p.length > 3 ? p[3] : null)}, row));
690690
found = true;
691691
return false;

0 commit comments

Comments
 (0)