Expand study/cohort fields

Author: bbimber

SivStudies/resources/queries/study/demographics/.qview.xml

@@ -13,7 +13,7 @@
 <!--        </column>-->
         <column name="death"/>
         <column name="projects/allStudies"/>
-        <column name="projects/categories"/>
+        <column name="projects/subgroups"/>
         <column name="immunizations/immunizations"/>
         <column name="outcomes/outcomes"/>
     </columns>

SivStudies/resources/queries/study/demographics/Expanded.qview.xml

@@ -7,7 +7,7 @@
         <column name="birth"/>
         <column name="death"/>
         <column name="projects/allStudies"/>
-        <column name="projects/categories"/>
+        <column name="projects/subgroups"/>
         <column name="immunizations/immunizations"/>
         <column name="sivART/allInfections"/>
         <column name="sivART/allART"/>

SivStudies/resources/queries/study/demographicsProjects.query.xml

@@ -14,6 +14,9 @@
                     <column columnName="allStudies">
                         <columnTitle>All Studies</columnTitle>
                     </column>
+                    <column columnName="subgroups">
+                        <columnTitle>Subgroups/Treatments</columnTitle>
+                    </column>
                     <column columnName="rhCmvVaccines">
                         <columnTitle>RhCMV Vaccines?</columnTitle>
                     </column>

SivStudies/resources/queries/study/demographicsProjects.sql

@@ -3,6 +3,7 @@ SELECT
   count(s.Id) as totalProjects,
   group_concat(DISTINCT s.study, char(10)) as allStudies,
   group_concat(DISTINCT s.category, char(10)) as categories,
+  group_concat(DISTINCT s.subgroup, char(10)) as subgroups,
 
   GROUP_CONCAT(distinct CASE WHEN s.category = 'RhCMV-Vaccines' THEN 'Yes' ELSE null END, char(10)) as rhCmvVaccines,
   GROUP_CONCAT(distinct CASE WHEN s.category = 'SIV/ART' THEN 'Yes' ELSE null END, char(10)) as sivArt