Another round of SIV study formatting

Author: bbimber

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

@@ -9,6 +9,7 @@
         <column name="immunizations/immunizations"/>
         <column name="sivART/allInfections"/>
         <column name="sivART/ageAtInfection"/>
+        <column name="sivART/allART"/>
         <column name="sivART/artInitiationDPI"/>
         <column name="sivART/artReleaseWPI"/>
         <column name="interventions/allInterventions"/>

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

@@ -12,11 +12,13 @@
                         <columnTitle>SIV Infection</columnTitle>
                         <url>/query/executeQuery.view?schemaName=study&amp;query.queryName=treatments&amp;query.Id~eq=${Id}&amp;query.category~eq=SIV Infection</url>
                         <urlTarget>_blank</urlTarget>
+                        <displayWidth>150</displayWidth>
                     </column>
                     <column columnName="allART">
-                        <columnTitle>ART</columnTitle>
+                        <columnTitle>ART Regimen</columnTitle>
                         <url>/query/executeQuery.view?schemaName=study&amp;query.queryName=treatments&amp;query.Id~eq=${Id}&amp;query.category~eq=ART</url>
                         <urlTarget>_blank</urlTarget>
+                        <displayWidth>175</displayWidth>
                     </column>
                     <column columnName="infectionDate">
                         <columnTitle>Infection Date</columnTitle>

SivStudies/resources/queries/study/demographicsChallengeAndArt.sql

@@ -11,7 +11,7 @@ FROM (
       min(floor(age(t.DataSets.Demographics.birth, CASE WHEN t.category = 'SIV Infection' THEN t.date ELSE NULL END))) AS ageAtInfection,
 
       group_concat(DISTINCT CASE
-          WHEN t.category = 'ART' THEN (cast(month(t.date) as varchar) || '/' || cast(dayofmonth(t.date) as varchar) || '/' || cast(year(t.date) as varchar) || ' (' || t.treatment || ')')
+          WHEN t.category = 'ART' THEN (t.treatment || ' (' || t.timePostSivChallenge.timePostInfection || ')')
           ELSE NULL
       END, char(10)) as allART,
       min(CASE

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

@@ -13,12 +13,15 @@
                     </column>
                     <column columnName="allStudies">
                         <columnTitle>Studies</columnTitle>
+                        <url>/query/executeQuery.view?schemaName=study&amp;query.queryName=assignment&amp;query.Id~eq=${Id}</url>
+                        <urlTarget>_blank</urlTarget>
                     </column>
                     <column columnName="allStudiesAndAnalyses">
                         <columnTitle>Studies and Analyses</columnTitle>
                     </column>
                     <column columnName="analysisGroups">
-                        <columnTitle>Analyses</columnTitle>
+                        <columnTitle>Analysis Groups</columnTitle>
+                        <displayWidth>150</displayWidth>
                     </column>
                     <column columnName="subgroups">
                         <columnTitle>Subgroups/Treatments</columnTitle>