diff --git a/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/model/SnpAssociationTableView.java b/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/model/SnpAssociationTableView.java index f9b4297ad..4ca9dcd97 100644 --- a/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/model/SnpAssociationTableView.java +++ b/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/model/SnpAssociationTableView.java @@ -41,6 +41,8 @@ public class SnpAssociationTableView { private String efoTraits; + private String backgroundEfoTraits; + private Float orPerCopyNum; private Float orPerCopyRecip; @@ -93,6 +95,7 @@ public SnpAssociationTableView(Long associationId, String betaUnit, String description, String efoTraits, + String backgroundEfoTraits, String lastMappingDate, String lastMappingPerformedBy, String multiSnpHaplotype, @@ -120,6 +123,7 @@ public SnpAssociationTableView(Long associationId, this.betaUnit = betaUnit; this.description = description; this.efoTraits = efoTraits; + this.backgroundEfoTraits = backgroundEfoTraits; this.lastMappingDate = lastMappingDate; this.lastMappingPerformedBy = lastMappingPerformedBy; this.multiSnpHaplotype = multiSnpHaplotype; @@ -213,6 +217,14 @@ public void setEfoTraits(String efoTraits) { this.efoTraits = efoTraits; } + public String getBackgroundEfoTraits() { + return backgroundEfoTraits; + } + + public void setBackgroundEfoTraits(String backgroundEfoTraits) { + this.backgroundEfoTraits = backgroundEfoTraits; + } + public String getLastMappingDate() { return lastMappingDate; } @@ -376,4 +388,4 @@ public AssociationExtension getAssociationExtension() { public void setAssociationExtension(AssociationExtension associationExtension) { this.associationExtension = associationExtension; } -} \ No newline at end of file +} diff --git a/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/service/SnpAssociationTableViewService.java b/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/service/SnpAssociationTableViewService.java index 9229781ff..224cf804b 100644 --- a/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/service/SnpAssociationTableViewService.java +++ b/goci-interfaces/goci-curation/src/main/java/uk/ac/ebi/spot/goci/curation/service/SnpAssociationTableViewService.java @@ -223,6 +223,13 @@ public SnpAssociationTableView createSnpAssociationTableView(Association associa associationEfoTraits = String.join(", ", efoTraits); snpAssociationTableView.setEfoTraits(associationEfoTraits); + Collection backgroundEfoTraits = new ArrayList<>(); + for (EfoTrait efoTrait: association.getBkgEfoTraits()) { + backgroundEfoTraits.add(efoTrait.getTrait()); + } + String associationBackgroundEfoTraits = String.join(",", backgroundEfoTraits); + snpAssociationTableView.setBackgroundEfoTraits(associationBackgroundEfoTraits); + // Set OR values snpAssociationTableView.setOrPerCopyNum(association.getOrPerCopyNum()); snpAssociationTableView.setOrPerCopyRecip(association.getOrPerCopyRecip()); diff --git a/goci-interfaces/goci-curation/src/main/resources/templates/study_association.html b/goci-interfaces/goci-curation/src/main/resources/templates/study_association.html index 4c2f684d5..83b4c038d 100644 --- a/goci-interfaces/goci-curation/src/main/resources/templates/study_association.html +++ b/goci-interfaces/goci-curation/src/main/resources/templates/study_association.html @@ -182,6 +182,7 @@ p-Value (mantissa x 10 exponent) p-Value Description EFO trait + Background EFO trait OR OR reciprocal Beta @@ -485,6 +486,13 @@ th:text="'Warning: EFO trait not assigned'"> + +

+ + +

@@ -616,4 +624,4 @@ - \ No newline at end of file +