Skip to content

Commit cb252fa

Browse files
bbimberbbimber
authored
Merge pull request #152 from bimberlabinternal/24.3_fb_merge
Merge 23.11 into 24.3
2 parents f7ccedf + c2e9f01 commit cb252fa

File tree

130 files changed

+3220
-247
lines changed

Some content is hidden

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

130 files changed

+3220
-247
lines changed

‎GenotypeAssays/src/org/labkey/genotypeassays/AlignmentDisplayColumn.java‎

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

‎LabPurchasing/resources/queries/labpurchasing/purchases.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@ var console = require("console");
33

44
var triggerHelper = new org.labkey.labpurchasing.LabPurchasingTriggerHelper(LABKEY.Security.currentUser.id, LABKEY.Security.currentContainer.id);
55

6+
function beforeInsert(row, errors){
7+
// The purpose of this is to allow the user to provide a string value for
8+
// vendorId or vendorName, and attempt to resolve this against known vendors:
9+
if (!row.vendorId || isNaN(row.vendorId)) {
10+
var vendorName = row.vendorName || row.vendorId;
11+
if (vendorName) {
12+
LABKEY.Query.selectRows({
13+
schemaName: 'labpurchasing',
14+
queryName: 'vendors',
15+
columns: 'rowid',
16+
filterArray: [LABKEY.Filter.create('vendorName', vendorName)],
17+
sort: '-rowid',
18+
maxRows: 1,
19+
scope: this,
20+
success: function(results) {
21+
if (results.rows.length) {
22+
row.vendorId = results.rows[0].rowId;
23+
}
24+
}
25+
})
26+
}
27+
}
28+
}
29+
630
function afterInsert(row, errors){
731
afterUpsert(row, null, errors);
832
}

‎LabPurchasing/resources/queries/labpurchasing/referenceItems.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ function beforeInsert(row, errors){
1919
if (results.rows.length) {
2020
row.vendorId = results.rows[0].rowId;
2121
}
22-
else {
23-
console.error("Unable to resolve vendor: " + vendorName);
24-
}
2522
}
2623
})
2724
}

‎MccColony/resources/queries/study/demographics/.qview.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,46 @@
2727
<column name="Id/MostRecentWeight/MostRecentWeightDate"/>
2828
<column name="alternateIds"/>
2929
<column name="excludeFromCensus"/>
30+
<column name="Id/mostRecentObservations/availability::observation">
31+
<properties>
32+
<property name="columnTitle" value="Availability"/>
33+
</properties>
34+
</column>
35+
<column name="Id/mostRecentObservations/current_housing_status::observation">
36+
<properties>
37+
<property name="columnTitle" value="Housing Status"/>
38+
</properties>
39+
</column>
40+
<column name="Id/mostRecentObservations/infant_history::observation">
41+
<properties>
42+
<property name="columnTitle" value="Infant History"/>
43+
</properties>
44+
</column>
45+
<column name="Id/mostRecentObservations/fertility_status::observation">
46+
<properties>
47+
<property name="columnTitle" value="Fertility Status"/>
48+
</properties>
49+
</column>
50+
<column name="Id/mostRecentObservations/medical_history::observation">
51+
<properties>
52+
<property name="columnTitle" value="Medical History"/>
53+
</properties>
54+
</column>
55+
<column name="Id/mostRecentObservations/usage_current::observation">
56+
<properties>
57+
<property name="columnTitle" value="Usage (Current)"/>
58+
</properties>
59+
</column>
60+
<column name="Id/mostRecentObservations/usage_future::observation">
61+
<properties>
62+
<property name="columnTitle" value="Usage (Future)"/>
63+
</properties>
64+
</column>
65+
<column name="Id/mostRecentObservations/date_of_observations">
66+
<properties>
67+
<property name="columnTitle" value="Date of Observations"/>
68+
</properties>
69+
</column>
3070
</columns>
3171
<sorts>
3272
<sort column="Id" descending="false"/>

‎MccColony/resources/queries/study/kinship/.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" label="All Flags">
2+
<columns>
3+
<column name="Id"/>
4+
<column name="Id2"/>
5+
<column name="kinship"/>
6+
<column name="relationship"/>
7+
<column name="Id/mccAlias/externalAlias"/>
8+
<column name="Id2MccAlias/externalAlias">
9+
<properties>
10+
<property name="columnTitle" value="Id2 MCC Alias"/>
11+
</properties>
12+
</column>
13+
</columns>
14+
15+
</customView>

‎PMR/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies {
88
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:DiscvrLabKeyModules:Studies", depProjectConfig: "published", depExtension: "module")
99
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:dataintegration", depProjectConfig: "published", depExtension: "module")
1010
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:DiscvrLabKeyModules:discvrcore", depProjectConfig: "published", depExtension: "module")
11+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:onprcEHRModules:GeneticsCore", depProjectConfig: "published", depExtension: "module")
1112

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

‎PMR/resources/etls/KinshipDataStaging.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<etl xmlns="http://labkey.org/etl/xml">
3+
<name>KinshipDataStaging</name>
4+
<description>Prepare PRIMe-seq Kinship Data for Import into PRIMe</description>
5+
<transforms>
6+
<transform id="kinship" type="TaskRefTransformStep">
7+
<taskref ref="org.labkey.pmr.etl.TriggerRemoteGeneticsImportStep">
8+
<settings>
9+
<setting name="remoteSource" value="EHR_ClinicalSource"/>
10+
</settings>
11+
</taskref>
12+
</transform>
13+
</transforms>
14+
</etl>

‎PMR/resources/folderTypes/PMR.folderType.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<modules>
6565
<moduleName>PMR</moduleName>
6666
<moduleName>EHR</moduleName>
67+
<moduleName>GeneticsCore</moduleName>
6768
</modules>
6869
<defaultModule>PMR</defaultModule>
6970
</folderType>

0 commit comments

Comments
 (0)