25.7 fb parentage reports (#1601)

* Modified Parentage report on both the Clinical Snapshot, and Parentage tab

* Modified Parentage reporting on the Clinical Snapshot reports.

* Modified Parentage reporting process.

* Modified Parentage reports to include source of data.

* Modified Offspring reporting to include surrogate mom.

Author: Ohsudev

onprc_ehr/resources/queries/study/parentageSummary.query.xml

@@ -4,6 +4,12 @@
             <table tableName="parentageSummary" tableDbType="TABLE">
                 <tableTitle>Parentage Summary</tableTitle>
                 <columns>
+                    <column columnName="Id">
+                        <columnTitle>Id</columnTitle>
+                    </column>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                    </column>
                     <column columnName="parent">
                         <columnTitle>Parent</columnTitle>
                         <fk>
@@ -18,6 +24,12 @@
                     <column columnName="method">
                         <columnTitle>Method</columnTitle>
                     </column>
+                    <column columnName="remark">
+                        <columnTitle>Comments</columnTitle>
+                    </column>
+                    <column columnName="source">
+                        <columnTitle>Data Source</columnTitle>
+                    </column>
                 </columns>
             </table>
         </tables>

onprc_ehr/resources/queries/study/parentageSummary.sql

@@ -18,10 +18,14 @@ SELECT
   p.date,
   p.parent,
   p.relationship,
-  p.method
+  p.method,
+  p.remark,
+  'Parentage' as source
 
 FROM study.parentage p
 WHERE p.qcstate.publicdata = true and p.enddate is null
+And  p.date in (select max(t.date) from study.parentage t where p.Id = t.Id And p.parent = t.parent
+And p.relationship =t.relationship And p.method = t.method And t.enddate is null and p.enddate is null and t.qcstate.publicdata = true)
 
 UNION
 
@@ -30,20 +34,23 @@ SELECT
   b.date,
   b.dam,
   'Dam' as relationship,
-  'Observed' as method
+  'Observed' as method,
+  null as remark,
+  'Birth' as source
 
 FROM study.birth b
 WHERE b.dam is not null and b.qcstate.publicdata = true
-And 'dam' not in (select k.relationship from study.parentage k where k.Id = b.Id and k.enddate is null)
+
 UNION
 
 SELECT
     a.Id,
-    a.date,
+     a.date,
     a.sire,
     'Sire' as relationship,
-    'Observed' as method
+    'Observed' as method,
+     null as remark,
+    'Birth' as source
 
 FROM study.birth a
 WHERE a.sire is not null and a.qcstate.publicdata = true
- And 'sire' not in (select k.relationship from study.parentage k where k.Id = a.Id and k.enddate is null)

onprc_ehr/resources/queries/study/parentageSummary/.qview.xml

@@ -0,0 +1,13 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id"/>
+        <column name="parent"/>
+        <column name="relationship"/>
+        <column name="method"/>
+        <column name="remark"/>
+        <column name="source"/>
+    </columns>
+    <sorts>
+        <sort column="date" descending="true"/>
+    </sorts>
+</customView>

onprc_ehr/resources/queries/study/parentageSummary/Parentage With Dates.qview.xml

@@ -0,0 +1,14 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id"/>
+        <column name="date"/>
+        <column name="parent"/>
+        <column name="relationship"/>
+        <column name="method"/>
+        <column name="remark"/>
+        <column name="source"/>
+    </columns>
+    <sorts>
+        <sort column="date" descending="true"/>
+    </sorts>
+</customView>