Skip to content

Fast-forward for 21.6.0 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 5 commits into from
Jun 16, 2021
Merged

Fast-forward for 21.6.0 #81

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3070ce
Update AIDImportMethod.java
bbimber Apr 2, 2021
f40936e
Merge pull request #68 from LabKey/20.11_fb_elispot
bbimber Apr 4, 2021
371ef44
Merge 20.11.Merge to 21.3
labkey-teamcity Jun 3, 2021
e604bfe
Merge pull request #76 from LabKey/21.3_fb_merge_20.11.Merge
bbimber Jun 4, 2021
12967f2
Merge 21.3.6 to 21.6
labkey-teamcity Jun 9, 2021
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
22 changes: 18 additions & 4 deletions elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.ListIterator;
Expand Down Expand Up @@ -291,17 +293,19 @@ protected List<Map<String, Object>> processRows(List<Map<String, Object>> rows,

private enum PLATE
{
spot("Spot counts:", "spots"),
saturation("Well's saturation values (%)", "saturation"),
cytokine("Cytokine Activities:", "cytokine");
spot("Spot counts:", "spots", Collections.singletonList("Number of Spots:")),
saturation("Well's saturation values (%)", "saturation", Collections.singletonList("Well's saturation values (%)")),
cytokine("Cytokine Activities:", "cytokine", Collections.singletonList("Activity:"));

private String description;
private String field;
private Collection<String> aliases;

PLATE(String description, String field)
PLATE(String description, String field, Collection<String> aliases)
{
this.description = description;
this.field = field;
this.aliases = aliases;
}

public static PLATE getByDescription(String description)
Expand All @@ -310,6 +314,16 @@ public static PLATE getByDescription(String description)
{
if (t.description.equalsIgnoreCase(description))
return t;
else if (t.aliases != null)
{
for (String alias : t.aliases)
{
if (alias.equals(description))
{
return t;
}
}
}
}
return null;
}
Expand Down