Merge 22.3 to develop

Author: labkey-teamcity

snprc_ehr/resources/queries/snprc_ehr/MhcData.query.xml

@@ -8,7 +8,13 @@
                 <updateUrl />
                 <deleteUrl />
                 <columns>
-                    <column columnName="Id"/>
+                    <column columnName="Id">
+                        <fk>
+                            <fkDbSchema>study</fkDbSchema>
+                            <fkTable>Animal</fkTable>
+                            <fkColumnName>Id</fkColumnName>
+                        </fk>
+                    </column>
                     <column columnName="OcId">
                         <columnTitle>OC ID</columnTitle>
                         <isHidden>true</isHidden>

snprc_ehr/resources/queries/snprc_ehr/MhcData/.qview.xml

@@ -0,0 +1,20 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id"/>
+        <column name="MHCValue"/>
+        <column name="Haplotype"/>
+        <column name="DataFileSource"/>
+        <column name="OcId"/>
+        <column name="Modified"/>
+        <column name="id/parents/dam"/>
+        <column name="id/parents/sire"/>
+        <column name="id/age/birth"/>
+        <column name="Id/age/ageInYears"/>
+        <column name="Id/AgeClass/Label"/>
+        <column name="Id/ActiveGroups/Colony::animal_group.Category"/>
+    </columns>
+    <sorts>
+        <sort column="Id"/>
+        <sort column="Haplotype" />
+    </sorts>
+</customView>

snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.query.xml

@@ -0,0 +1,30 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="MhcDataPivot" tableDbType="NOT_IN_DB" useColumnOrder="true">
+                <tableUrl />
+                <insertUrl />
+                <importUrl />
+                <updateUrl />
+                <deleteUrl />
+                <columns>
+                    <column columnName="Id">
+                        <fk>
+                            <fkDbSchema>study</fkDbSchema>
+                            <fkTable>Animal</fkTable>
+                            <fkColumnName>Id</fkColumnName>
+                        </fk>
+                    </column>
+                    <column columnName="OcId">
+                        <columnTitle>OC ID</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="DataFileSource">
+                        <columnTitle>Data File Source</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>

snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql

@@ -0,0 +1,25 @@
+SELECT
+    b.Id,
+    b.Haplotype,
+    b.Ocid,
+    b.DataFileSource,
+    b.modified,
+    group_concat(b.MhcValue) as MhcValue
+
+FROM (
+         SELECT
+             b.Id,
+             b.Haplotype,
+             b.Ocid,
+             b.MhcValue,
+             b.DataFileSource,
+             b.Modified
+         FROM snprc_ehr.MhcData as b
+         ) as b
+
+GROUP BY b.id, b.ocid, b.DataFileSource, b.haplotype, b.modified
+
+PIVOT MhcValue BY Haplotype IN
+(select distinct Haplotype from snprc_ehr.MhcData order by Haplotype
+
+)

snprc_ehr/resources/queries/study/BrowseDataSets.sql

@@ -45,6 +45,8 @@ select 'study' as schema, 'Colony Management' as CategoryId,'Animal Accounts & G
 UNION
 select 'snprc_ehr' as schema, 'Misc' as CategoryId,'MHC Data' as Label, 'MhcData' as Name,  true as ShowByDefault, true as isAnimal
 UNION
+select 'snprc_ehr' as schema, 'Misc' as CategoryId,'MHC Pivot' as Label, 'MhcDataPivot' as Name,  true as ShowByDefault, true as isAnimal
+UNION
 select 'study' as schema, 'Clinical' as CategoryId,'Daily Observations' as Label, 'DailyObs' as Name,  true as ShowByDefault, true as isAnimal
 UNION
 select 'study' as schema, 'Clinical' as CategoryId,'Daily Cycles' as Label, 'CycleDaily' as Name,  true as ShowByDefault, true as isAnimal

snprc_ehr/resources/source_queries/create_v_MhcData.sql

@@ -28,12 +28,12 @@ ALTER VIEW [labkey_etl].[V_MhcData] AS
 -- Create date: 5/16/2017
 -- Description:	
 -- Changes:
---
+-- 05/18/2022 removed leading spaces from animal id
 --
 -- ==========================================================================================
 
 SELECT
-	RIGHT(SPACE(6) + u.[Animal ID], 6) AS Id,
+	u.[Animal ID] AS Id,
 	u.[File Source] AS DataFileSource,
 	u.[OC ID] AS OcId,
 	u.Haplotype AS Haplotype,