Consider HTO when finding matched sorts

Author: bbimber

singlecell/resources/web/singlecell/panel/PoolImportPanel.js

@@ -553,6 +553,7 @@ Ext4.define('SingleCell.panel.PoolImportPanel', {
                 tissue: r.tissue,
                 objectId: r.objectId,
                 population: r.population,
+                hto: r.hto,
                 workbook: r.workbook
             });
         }, this);

singlecell/src/org/labkey/singlecell/SingleCellController.java

@@ -393,6 +393,15 @@ public Object execute(SimpleApiJsonForm form, BindException errors) throws Excep
                         {
                             SimpleFilter sortFilter = new SimpleFilter(FieldKey.fromString("sampleId"), rowId);
                             sortFilter.addCondition(FieldKey.fromString("population"), r.get("population"));
+                            if (r.get("hto") == null)
+                            {
+                                sortFilter.addCondition(FieldKey.fromString("hto"), null, CompareType.ISBLANK);
+                            }
+                            else
+                            {
+                                sortFilter.addCondition(FieldKey.fromString("hto"), r.get("hto"));
+                            }
+
                             TableSelector tsSort = new TableSelector(tiSort, PageFlowUtil.set("rowId"), sortFilter, null);
                             long countSort = tsSort.getRowCount();
                             if (countSort == 1)