Skip to content

Commit 1ab3493

Browse files
bbimberbbimber
authored
Merge pull request #193 from LabKey/fb_merge_23.11_to_develop
Merge 23.11 to develop
2 parents 8c83c6d + 95ccb12 commit 1ab3493

111 files changed

Lines changed: 2805 additions & 127 deletions

File tree

Some content is hidden

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

‎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>

‎hivrc/build.gradle‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import org.labkey.gradle.util.BuildUtils
2+
import org.labkey.gradle.util.ExternalDependency
3+
4+
repositories {
5+
mavenCentral()
6+
}
7+
8+
dependencies {
9+
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile")
10+
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
11+
12+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "published", depExtension: "module")
13+
14+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
15+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "published", depExtension: "module")
16+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:DiscvrLabKeyModules:discvrcore", depProjectConfig: "published", depExtension: "module")
17+
}

‎hivrc/module.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ModuleClass: org.labkey.hivrc.HivrcModule
2+
Label: BMGF HIVRC
3+
Description: This is designed to manage analyses and data collected as part of the BMGF HIVRC
4+
License: Apache 2.0
5+
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
6+
ManageVersion: false

‎hivrc/resources/folderTypes/HIVRC Analysis.folderType.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<folderType xmlns="http://labkey.org/data/xml/folderType">
2+
<name>HIVRC Analyses</name>
3+
<description>Workbook template for HIVRC analyses</description>
4+
<requiredWebParts>
5+
<webPart>
6+
<name>HIVRC Analysis Header</name>
7+
<location>body</location>
8+
</webPart>
9+
</requiredWebParts>
10+
<preferredWebParts>
11+
<webPart>
12+
<name>Pipeline Files</name>
13+
<location>body</location>
14+
<property name="title" value="Files" />
15+
</webPart>
16+
<webPart>
17+
<name>Messages</name>
18+
<location>body</location>
19+
<property name="boardName" value="Discussion" />
20+
<property name="conversationName" value="Comment" />
21+
</webPart>
22+
</preferredWebParts>
23+
<modules>
24+
<moduleName>HIVRC</moduleName>
25+
<moduleName>laboratory</moduleName>
26+
<moduleName>Pipeline</moduleName>
27+
<moduleName>Experiment</moduleName>
28+
<moduleName>Query</moduleName>
29+
<moduleName>Core</moduleName>
30+
</modules>
31+
<defaultModule>Core</defaultModule>
32+
<workbookType>true</workbookType>
33+
<forceAssayUploadIntoWorkbooks>true</forceAssayUploadIntoWorkbooks>
34+
</folderType>

‎hivrc/resources/folderTypes/HIVRC.folderType.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<ft:folderType xmlns:ft="http://labkey.org/data/xml/folderType">
2+
<ft:name>HIVRC Overview</ft:name>
3+
<ft:description>The default folder layout for an HIVRC project</ft:description>
4+
<ft:folderTabs>
5+
<ft:folderTab>
6+
<ft:name>overview</ft:name>
7+
<ft:caption>Overview</ft:caption>
8+
<ft:selectors>
9+
</ft:selectors>
10+
<ft:requiredWebParts>
11+
</ft:requiredWebParts>
12+
<ft:preferredWebParts>
13+
<ft:webPart>
14+
<ft:name>HIVRC Data and Analyses</ft:name>
15+
<ft:location>body</ft:location>
16+
</ft:webPart>
17+
</ft:preferredWebParts>
18+
</ft:folderTab>
19+
<ft:folderTab>
20+
<ft:name>datasets</ft:name>
21+
<ft:caption>Datasets</ft:caption>
22+
<ft:selectors>
23+
<ft:selector>
24+
<ft:view>datasets</ft:view>
25+
</ft:selector>
26+
</ft:selectors>
27+
<ft:requiredWebParts>
28+
</ft:requiredWebParts>
29+
<ft:preferredWebParts>
30+
<ft:webPart>
31+
<ft:name>HIVRC Datasets</ft:name>
32+
<ft:location>body</ft:location>
33+
</ft:webPart>
34+
</ft:preferredWebParts>
35+
</ft:folderTab>
36+
<ft:folderTab>
37+
<ft:name>analyses</ft:name>
38+
<ft:caption>Analyses</ft:caption>
39+
<ft:selectors>
40+
<ft:selector>
41+
<ft:view>analyses</ft:view>
42+
</ft:selector>
43+
</ft:selectors>
44+
<ft:requiredWebParts>
45+
</ft:requiredWebParts>
46+
<ft:preferredWebParts>
47+
<ft:webPart>
48+
<ft:name>HIVRC Analyses</ft:name>
49+
<ft:location>body</ft:location>
50+
</ft:webPart>
51+
</ft:preferredWebParts>
52+
</ft:folderTab>
53+
</ft:folderTabs>
54+
<ft:modules>
55+
<ft:moduleName>hivrc</ft:moduleName>
56+
</ft:modules>
57+
<ft:defaultModule>hivrc</ft:defaultModule>
58+
<ft:forceAssayUploadIntoWorkbooks>true</ft:forceAssayUploadIntoWorkbooks>
59+
</ft:folderType>

‎hivrc/resources/queries/laboratory/workbooks.query.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="workbooks" tableDbType="TABLE" useColumnOrder="true">
5+
<tableTitle>HIVRC Analyses</tableTitle>
6+
<titleColumn>workbookId</titleColumn>
7+
<columns>
8+
<column columnName="workbookId">
9+
<columnTitle>Analysis #</columnTitle>
10+
</column>
11+
</columns>
12+
</table>
13+
</tables>
14+
</metadata>
15+
</query>

‎hivrc/resources/schemas/dbscripts/postgresql/hivrc-0.00-23.000.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CREATE SCHEMA hivrc;

‎hivrc/resources/schemas/dbscripts/postgresql/hivrc-23.000-23.001.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
CREATE TABLE hivrc.datasets (
2+
rowid SERIAL,
3+
label varchar(1000),
4+
description varchar(4000),
5+
6+
datatype varchar(1000),
7+
dataowner varchar(1000),
8+
fileid int,
9+
10+
container entityid,
11+
created timestamp,
12+
createdby int,
13+
modified timestamp,
14+
modifiedby int,
15+
16+
constraint PK_datasets PRIMARY KEY (rowid)
17+
);

‎hivrc/resources/schemas/dbscripts/sqlserver/hivrc-0.00-23.000.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CREATE SCHEMA hivrc;
2+
GO

0 commit comments

Comments
 (0)