Update mGAP Query

Author: bbimber

mGAP/resources/queries/mGAP/subjectsSource.query.xml

@@ -2,6 +2,7 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="" tableDbType="TABLE">
+                <tableTitle>mGAP Subject/Demographics Source Data</tableTitle>
                 <pkColumnName>subjectName</pkColumnName>
             </table>
         </tables>

mGAP/resources/queries/mGAP/subjectsSource.sql

@@ -10,9 +10,15 @@ SELECT
     WHEN s.Id IS NOT NULL THEN 'ONPRC'
     ELSE NULL END as center,
   d.status as status,
-  m.subjectname as originalId
+  m.subjectname as originalId,
+  p1.externalAlias as sire,
+  coalesce(s.Id.parents.sire, d.sire) as originalSire,
+  p2.externalAlias as dam,
+  coalesce(s.Id.parents.dam, d.dam) as originalDam,
 
 FROM mgap.animalMapping m
 LEFT JOIN "/Internal/PMR/".study.demographics s ON (m.subjectname = s.Id)
 LEFT JOIN mgap.demographics d ON (m.subjectname = d.subjectname)
+LEFT JOIN mgap.animalMapping p1 ON (p1.subjectname = coalesce(s.Id.parents.sire, d.sire))
+LEFT JOIN mgap.animalMapping p2 ON (p2.subjectname = coalesce(s.Id.parents.dam, d.dam))
 WHERE (s.Id IS NOT NULL OR d.subjectname IS NOT NULL)

mGAP/resources/views/mgapDataDashboard.html

@@ -100,7 +100,7 @@
                         name: 'Subject Information Synced to mGAP',
                         url: LABKEY.ActionURL.buildURL('query', 'executeQuery.view', null, {
                             schemaName: 'mgap',
-                            queryName: 'subjectDatasetsSource'
+                            queryName: 'subjectsSource'
                         })
                     }]
                 },{