Skip to content

Commit f3ad067

Browse files
bbimberbbimber
committed
Merge discvr-25.3 to develop
2 parents 2ecf40b + e0e8d67 commit f3ad067

File tree

72 files changed

+3180
-625
lines changed

Some content is hidden

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

72 files changed

+3180
-625
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@
189189
</transforms>
190190

191191
<!-- <incrementalFilter className="ModifiedSinceFilterStrategy" timestampColumnName="modified" >-->
192-
<!-- &lt;!&ndash; TODO: enable once PRIMe deploys 23.7 &ndash;&gt;-->
193-
<!-- &lt;!&ndash;<deletedRowsSource remoteSource="EHR_ClinicalSource" schemaName="AuditSummary" queryName="DatasetUpdateAuditLog" deletedSourceKeyColumnName="primaryKey" targetKeyColumnName="objectid"/>&ndash;&gt;-->
192+
<!-- <deletedRowsSource remoteSource="EHR_ClinicalSource" schemaName="AuditSummary" queryName="DatasetUpdateAuditLog" deletedSourceKeyColumnName="primaryKey" targetKeyColumnName="objectid"/>-->
194193
<!-- </incrementalFilter>-->
195194
<schedule>
196195
<!--11PM-->

‎SivStudies/build.gradle‎

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

‎SivStudies/module.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ModuleClass: org.labkey.sivstudies.SivStudiesModule
2+
Label: SIV Studies
3+
Description: A module designed to manage data from SIV and related studies.
4+
License: Apache 2.0
5+
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
6+
ManageVersion: false
7+
SupportedDatabases: mssql, pgsql

‎SivStudies/resources/data/amount_units.tsv‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
value
2+
g
3+
IU
4+
U
5+
mEq
6+
mg
7+
no units
8+
ug
9+
units
10+
L/min
11+
%

‎SivStudies/resources/data/calculated_status_codes.tsv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
value
2+
Alive
3+
Dead
4+
No Record
5+
Shipped
6+
Unknown

‎SivStudies/resources/data/conc_units.tsv‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
value denominator numerator
2+
g/ml mL g
3+
g/tsp tsp g
4+
IU/ml mL IU
5+
mEq/ml mL mEq
6+
mg/capsule capsule(s) mg
7+
mg/ml mL mg
8+
mg/piece piece(s) mg
9+
mg/tablet tablet(s) mg
10+
mg/tsp tsp mg
11+
ug/ml mL ug
12+
units/ml mL units

‎SivStudies/resources/data/dosage_units.tsv‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
value numerator denominator
2+
g/kg g kg
3+
IU/kg IU kg
4+
mEq/kg mEq kg
5+
mg/animal mg
6+
mg/kg mg kg
7+
ml/kg ml kg
8+
no units
9+
ounces/kg ounces kg
10+
ug/kg ug kg
11+
units/kg units kg

‎SivStudies/resources/data/gender_codes.tsv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
v meaning origgender
2+
f Female f
3+
m Male m
4+
u Unknown

‎SivStudies/resources/data/geographic_origins.tsv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
value
2+
Indian
3+
Chinese
4+
Hybrid

‎SivStudies/resources/data/lookup_sets.tsv‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
setname label keyfield titleColumn
2+
amount_units Amount Units unit
3+
calculated_status_codes Calculated Status Codes code
4+
conc_units Concentraiton Units unit
5+
dosage_units Dosage Units unit
6+
gender_codes Gender Codes
7+
geographic_origins Geographic Origins origin
8+
routes Routes route
9+
volume_units Volume Units unit

0 commit comments

Comments
 (0)