Skip to content

Commit 05cf4ff

Browse files
bbimberbbimber
committed
Merge discvr-25.7 to develop
2 parents 9d2960b + c838d02 commit 05cf4ff

File tree

64 files changed

+1896
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1896
-720
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"));

‎PMR/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:premiumModules:dataintegration", depProjectConfig: "published", depExtension: "module")
1010
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:DiscvrLabKeyModules:discvrcore", depProjectConfig: "published", depExtension: "module")
1111
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:onprcEHRModules:GeneticsCore", depProjectConfig: "published", depExtension: "module")
12+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:BimberLabKeyModules:primeseq", depProjectConfig: "published", depExtension: "module")
1213

1314
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:DiscvrLabKeyModules:Studies", depProjectConfig: "apiJarFile")
1415
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:premiumModules:dataintegration", depProjectConfig: "apiJarFile")

‎PMR/resources/etls/pmr-datasets.xml‎

Lines changed: 0 additions & 198 deletions
This file was deleted.

‎PMR/resources/etls/pmr-demographics.xml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎PMR/resources/etls/pmrClinicalData.xml‎

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,91 @@
66
<transform id="demographics" type="TaskrefTransformStep">
77
<taskref ref="org.labkey.di.steps.QueueJobTask">
88
<settings>
9-
<setting name="transformId" value="{PMR}/pmr-demographics"/>
9+
<setting name="transformId" value="{PMR}/prime-demographics"/>
1010
</settings>
1111
</taskref>
1212
</transform>
1313

14-
<transform id="datasets" type="TaskrefTransformStep">
14+
<transform id="birth" type="TaskrefTransformStep">
1515
<taskref ref="org.labkey.di.steps.QueueJobTask">
1616
<settings>
17-
<setting name="transformId" value="{PMR}/pmr-datasets"/>
17+
<setting name="transformId" value="{PMR}/prime-birth"/>
1818
</settings>
1919
</taskref>
2020
</transform>
21+
22+
<transform id="blooddraws" type="TaskrefTransformStep">
23+
<taskref ref="org.labkey.di.steps.QueueJobTask">
24+
<settings>
25+
<setting name="transformId" value="{PMR}/prime-blooddraws"/>
26+
</settings>
27+
</taskref>
28+
</transform>
29+
30+
<transform id="chemistryResults" type="TaskrefTransformStep">
31+
<taskref ref="org.labkey.di.steps.QueueJobTask">
32+
<settings>
33+
<setting name="transformId" value="{PMR}/prime-chemistryResults"/>
34+
</settings>
35+
</taskref>
36+
</transform>
37+
38+
<transform id="clinpathRuns" type="TaskrefTransformStep">
39+
<taskref ref="org.labkey.di.steps.QueueJobTask">
40+
<settings>
41+
<setting name="transformId" value="{PMR}/prime-clinpathRuns"/>
42+
</settings>
43+
</taskref>
44+
</transform>
45+
46+
<transform id="hematologyResults" type="TaskrefTransformStep">
47+
<taskref ref="org.labkey.di.steps.QueueJobTask">
48+
<settings>
49+
<setting name="transformId" value="{PMR}/prime-hematologyResults"/>
50+
</settings>
51+
</taskref>
52+
</transform>
53+
54+
<transform id="histology" type="TaskrefTransformStep">
55+
<taskref ref="org.labkey.di.steps.QueueJobTask">
56+
<settings>
57+
<setting name="transformId" value="{PMR}/prime-histology"/>
58+
</settings>
59+
</taskref>
60+
</transform>
61+
62+
<transform id="microbiology" type="TaskrefTransformStep">
63+
<taskref ref="org.labkey.di.steps.QueueJobTask">
64+
<settings>
65+
<setting name="transformId" value="{PMR}/prime-microbiology"/>
66+
</settings>
67+
</taskref>
68+
</transform>
69+
70+
<transform id="parentage" type="TaskrefTransformStep">
71+
<taskref ref="org.labkey.di.steps.QueueJobTask">
72+
<settings>
73+
<setting name="transformId" value="{PMR}/prime-parentage"/>
74+
</settings>
75+
</taskref>
76+
</transform>
77+
78+
<transform id="pathologyDiagnoses" type="TaskrefTransformStep">
79+
<taskref ref="org.labkey.di.steps.QueueJobTask">
80+
<settings>
81+
<setting name="transformId" value="{PMR}/prime-pathologyDiagnoses"/>
82+
</settings>
83+
</taskref>
84+
</transform>
85+
86+
<transform id="weight" type="TaskrefTransformStep">
87+
<taskref ref="org.labkey.di.steps.QueueJobTask">
88+
<settings>
89+
<setting name="transformId" value="{PMR}/prime-weight"/>
90+
</settings>
91+
</taskref>
92+
</transform>
93+
2194
</transforms>
2295
<schedule>
2396
<cron expression="0 30 1 * * ?"/>

0 commit comments

Comments
 (0)