Skip to content

Commit 4cf34f1

Browse files
bbimberbbimber
committed
Merge discvr-25.3 to discvr-25.7
2 parents d2cde06 + 5b4d5fe commit 4cf34f1

File tree

11 files changed

+149
-1
lines changed

11 files changed

+149
-1
lines changed

‎GenotypeAssays/test/src/org/labkey/test/tests/external/labModules/GenotypeAssaysTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ private void beadStudioImportTest()
182182

183183
Ext4FieldRef.getForLabel(this, "Run Description").setValue("Description");
184184

185+
waitForElement(Ext4Helper.Locators.ext4Button("Download Example Data"));
185186
File exampleData = clickAndWaitForDownload(Ext4Helper.Locators.ext4Button("Download Example Data"));
186187

187188
waitAndClick(Ext4Helper.Locators.radiobutton(this, "File Upload"));

‎SivStudies/resources/data/reports.tsv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ query Clinical study hematologyPivot CBC/Hematology
77
query Study Design study assignment Project/Study Assignment
88
query Research study flow Flow Cytometry
99
query Research study outcomes Study Outcomes/Phenotypes
10-
query Research study genetics Genetic Data / MHC
10+
query Research study pvl_outcomes Study PVL-Based Outcomes
11+
query Research study genetics Genetic Data / MHC
1112
query Clinical study procedures Procedures
1213
query Research study viralLoads Viral Loads
1314
query General study samples Samples

‎SivStudies/resources/queries/study/duplicateInfectionDates.query.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="duplicateInfectionDates" tableDbType="NOT_IN_DB">
5+
<tableTitle>Duplicate Infection Dates</tableTitle>
6+
<columns>
7+
8+
</columns>
9+
</table>
10+
</tables>
11+
</metadata>
12+
</query>

‎SivStudies/resources/queries/study/duplicateInfectionDates.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SELECT
2+
t.Id,
3+
t.date,
4+
'SIV Infection' as category
5+
6+
FROM study.treatments t
7+
WHERE t.category = 'SIV Infection'
8+
9+
GROUP BY t.Id, t.date
10+
HAVING count(*) > 1

‎SivStudies/resources/queries/study/infectionAnchorDateDiscordance.query.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="infectionAnchorDateDiscordance" tableDbType="NOT_IN_DB">
5+
<tableTitle>Discordant Infection Dates</tableTitle>
6+
<columns>
7+
<column columnName="treatmentTableDate">
8+
<columnTitle>Date (Treatments Table)</columnTitle>
9+
</column>
10+
<column columnName="subjectAnchorDatesTableDate">
11+
<columnTitle>Date (Anchor Dates Table)</columnTitle>
12+
</column>
13+
</columns>
14+
</table>
15+
</tables>
16+
</metadata>
17+
</query>

‎SivStudies/resources/queries/study/infectionAnchorDateDiscordance.sql‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
SELECT
2+
t.Id,
3+
'SIV Infection' as category,
4+
t.date as treatmentTableDate,
5+
t2.date as subjectAnchorDatesTableDate
6+
7+
FROM study.treatments t
8+
FULL JOIN studies.subjectAnchorDates t2 ON (
9+
t2.subjectId = t.Id AND
10+
t2.eventLabel = 'SIV Infection'
11+
)
12+
13+
WHERE t.category = 'SIV Infection' AND t2.date != t.date

‎SivStudies/resources/queries/study/pvl_outcomes.query.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="pvl_outcomes" tableDbType="TABLE" useColumnOrder="true">
5+
<columns>
6+
<column columnName="Id"/>
7+
<column columnName="date">
8+
<columnTitle>Date</columnTitle>
9+
<formatString>Date</formatString>
10+
</column>
11+
<column columnName="outcome">
12+
<columnTitle>Outcome/Phenotype</columnTitle>
13+
</column>
14+
<column columnName="numeric_value">
15+
<columnTitle>Numeric Value</columnTitle>
16+
</column>
17+
<column columnName="string_value">
18+
<columnTitle>String Value</columnTitle>
19+
</column>
20+
<column columnName="comments">
21+
<columnTitle>Comments</columnTitle>
22+
</column>
23+
<column columnName="dataSource">
24+
<columnTitle>Data Source</columnTitle>
25+
</column>
26+
</columns>
27+
</table>
28+
</tables>
29+
</metadata>
30+
</query>

‎SivStudies/resources/queries/study/pvl_outcomes/.qview.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView" hidden="false" canOverride="false">
2+
<columns>
3+
<column name="Id"/>
4+
<column name="date"/>
5+
<column name="outcome"/>
6+
<column name="numeric_value"/>
7+
<column name="string_value"/>
8+
<column name="comments"/>
9+
<column name="dataSource"/>
10+
</columns>
11+
<sorts>
12+
<sort column="Id" descending="false"/>
13+
<sort column="outcome" descending="true"/>
14+
</sorts>
15+
</customView>

‎SivStudies/resources/referenceStudy/study/datasets/datasets_manifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,8 @@
4646
<dataset name="outcomes" showByDefault="true" category="Research" type="Standard" id="15">
4747
<tags/>
4848
</dataset>
49+
<dataset name="pvl_outcomes" showByDefault="true" category="Research" type="Standard" id="16">
50+
<tags/>
51+
</dataset>
4952
</datasets>
5053
</datasets>

‎SivStudies/resources/referenceStudy/study/datasets/datasets_metadata.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,4 +517,36 @@
517517
</columns>
518518
<tableTitle>Outcomes/Phenotypes</tableTitle>
519519
</table>
520+
<table tableName="pvl_outcomes" tableDbType="TABLE">
521+
<columns>
522+
<column columnName="Id">
523+
<datatype>varchar</datatype>
524+
<conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
525+
</column>
526+
<column columnName="date">
527+
<datatype>timestamp</datatype>
528+
<conceptURI>http://cpas.labkey.com/laboratory#sampleDate</conceptURI>
529+
</column>
530+
<column columnName="dataSource">
531+
<datatype>varchar</datatype>
532+
</column>
533+
<column columnName="objectId">
534+
<datatype>entityid</datatype>
535+
<isKeyField>true</isKeyField>
536+
</column>
537+
<column columnName="outcome">
538+
<datatype>varchar</datatype>
539+
</column>
540+
<column columnName="numeric_value">
541+
<datatype>double</datatype>
542+
</column>
543+
<column columnName="string_value">
544+
<datatype>varchar</datatype>
545+
</column>
546+
<column columnName="comments">
547+
<datatype>varchar</datatype>
548+
</column>
549+
</columns>
550+
<tableTitle>PVL Outcomes</tableTitle>
551+
</table>
520552
</tables>

0 commit comments

Comments
 (0)