Add study columns

Author: bbimber

Studies/resources/query/study/demographics.query.xml

@@ -2,6 +2,7 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="Demographics" tableDbType="TABLE" useColumnOrder="true">
+                <javaCustomizer class="org.labkey.studies.query.StudiesCustomizer"/>
                 <columns>
                     <column columnName="Id">
                         <url />

Studies/resources/query/study/studyData.query.xml

@@ -4,8 +4,19 @@
             <table tableName="" tableDbType="TABLE" useColumnOrder="true">
                 <javaCustomizer class="org.labkey.studies.query.StudiesCustomizer"/>
                 <columns>
-                    <column columnName="Id"/>
-                    <column columnName="date"/>
+                    <column columnName="Id">
+
+                    </column>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                    </column>
+                    <column columnName="enddate">
+                        <columnTitle>End Date</columnTitle>
+                    </column>
+                    <column columnName="objectid">
+                        <columnTitle>Key</columnTitle>
+                        <isHidden>true</isHidden>
+                    </column>
                 </columns>
             </table>
         </tables>

Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml

@@ -4,13 +4,13 @@
         <dataset name="flags" category="Research" type="Standard" id="1">
             <tags/>
         </dataset>
-        <dataset name="treatments" showByDefault="false" category="Research" type="Standard" id="2">
+        <dataset name="treatments" showByDefault="true" category="Research" type="Standard" id="2">
             <tags/>
         </dataset>
         <dataset name="weight" showByDefault="true" category="Research" type="Standard" id="3">
             <tags/>
         </dataset>
-        <dataset name="labwork" showByDefault="false" category="Research" type="Standard" id="4">
+        <dataset name="labwork" showByDefault="true" category="Research" type="Standard" id="4">
             <tags/>
         </dataset>
         <dataset name="demographics" category="Research" demographicData="true" type="Standard" id="5">

Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml

@@ -279,9 +279,18 @@
             <column columnName="enddate">
                 <datatype>timestamp</datatype>
             </column>
+            <column columnName="category">
+                <datatype>varchar</datatype>
+            </column>
             <column columnName="study">
                 <datatype>varchar</datatype>
             </column>
+            <column columnName="subgroup">
+                <datatype>varchar</datatype>
+            </column>
+            <column columnName="description">
+                <datatype>varchar</datatype>
+            </column>
         </columns>
         <tableTitle>Project Assignment</tableTitle>
     </table>

Studies/resources/views/studiesAdmin.html

@@ -22,7 +22,7 @@
             sections: [{
                 header: 'Configuration/Data Management',
                 items: [{
-                    name: 'Import/Re-import MCC Study',
+                    name: 'Import/Re-import Study and Reference Data',
                     url: LABKEY.ActionURL.buildURL('studies', 'importStudy.view')
                 }]
             }]