diff --git a/MccColony/resources/queries/study/demographics/.qview.xml b/MccColony/resources/queries/study/demographics/.qview.xml
index a35d07baa..3bb77e21b 100644
--- a/MccColony/resources/queries/study/demographics/.qview.xml
+++ b/MccColony/resources/queries/study/demographics/.qview.xml
@@ -26,6 +26,7 @@
+
diff --git a/mGAP/src/org/labkey/mgap/pipeline/mGapSummarizer.java b/mGAP/src/org/labkey/mgap/pipeline/mGapSummarizer.java
index c27fc0794..ced520a20 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/mGapSummarizer.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/mGapSummarizer.java
@@ -174,7 +174,7 @@ private static class FieldData
public static void filterCodingPotential(Set codingPotential)
{
//due to overlapping transcripts, this is often added. remove these less-specific terms in order
- for (String type : Arrays.asList("intragenic_variant", "non_coding_transcript_variant", "intron_variant"))
+ for (String type : Arrays.asList("custom", "intergenic_variant", "intragenic_variant"))
{
if (codingPotential.size() > 1)
{
@@ -184,9 +184,8 @@ public static void filterCodingPotential(Set codingPotential)
if (codingPotential.contains("synonymous_variant") || codingPotential.contains("missense_variant"))
{
+ codingPotential.remove("intergenic_variant");
codingPotential.remove("intragenic_variant");
- codingPotential.remove("non_coding_transcript_variant");
- codingPotential.remove("intron_variant");
}
}
diff --git a/mcc/resources/queries/mcc/aggregatedDemographics.sql b/mcc/resources/queries/mcc/aggregatedDemographics.sql
index 4f481572f..39586b680 100644
--- a/mcc/resources/queries/mcc/aggregatedDemographics.sql
+++ b/mcc/resources/queries/mcc/aggregatedDemographics.sql
@@ -19,6 +19,7 @@ SELECT
WHEN d.calculated_status = 'Alive' AND (SELECT COUNT(f.flag.value) as total FROM "/data/Colonies/SNPRC/".study.flags f WHERE f.Id = d.Id AND f.isActive = true) > 0 THEN true
ELSE false
END as u24_status,
+ d.litterId,
d.Id.mostRecentDeparture.mostRecentDeparture,
o.availability,
o.current_housing_status,
@@ -67,6 +68,7 @@ SELECT
WHEN d.calculated_status = 'Alive' AND (SELECT COUNT(f.flag.value) as total FROM "/data/Colonies/WNPRC/".study.flags f WHERE f.Id = d.Id AND f.isActive = true) > 0 THEN true
ELSE false
END as u24_status,
+ d.litterId,
d.Id.mostRecentDeparture.mostRecentDeparture,
o.availability,
o.current_housing_status,
@@ -112,6 +114,7 @@ SELECT
d.objectid,
d.calculated_status,
d.u24_status,
+ d.litterId,
d.Id.mostRecentDeparture.mostRecentDeparture,
o.availability,
o.current_housing_status,
@@ -160,6 +163,7 @@ SELECT
d.objectid,
d.calculated_status,
d.u24_status,
+ d.litterId,
d.Id.mostRecentDeparture.mostRecentDeparture,
o.availability,
o.current_housing_status,
diff --git a/mcc/resources/queries/study/demographics.query.xml b/mcc/resources/queries/study/demographics.query.xml
index 3de9b0e1a..b0ce71b6e 100644
--- a/mcc/resources/queries/study/demographics.query.xml
+++ b/mcc/resources/queries/study/demographics.query.xml
@@ -9,7 +9,7 @@
-
+
true
@@ -121,6 +121,13 @@
Alternate IDs
+
+ Litter ID
+ /query/executeQuery.view?schemaName=study&
+ query.queryName=Demographics&
+ query.litterId~eq=${litterId}
+
+
diff --git a/mcc/resources/queries/study/demographics/.qview.xml b/mcc/resources/queries/study/demographics/.qview.xml
index 8950e4cd5..a5c82e8f7 100644
--- a/mcc/resources/queries/study/demographics/.qview.xml
+++ b/mcc/resources/queries/study/demographics/.qview.xml
@@ -36,6 +36,7 @@
+
diff --git a/mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml b/mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 912def432..202636ca8 100644
--- a/mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -685,6 +685,9 @@
boolean
+
+ varchar
+
Demographics
diff --git a/primeseq/resources/etls/mcc.xml b/primeseq/resources/etls/mcc.xml
index 2277dbbc5..0d027d146 100644
--- a/primeseq/resources/etls/mcc.xml
+++ b/primeseq/resources/etls/mcc.xml
@@ -12,6 +12,9 @@
sire
gender
+
+
+