Skip to content

Merge discvr-24.7 to develop #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbimber merged 12 commits into from
Jul 24, 2024
Merged

Merge discvr-24.7 to develop #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e51a719
Ensure PopulateIds runs prior to center ETLs
bbimber Jul 14, 2024
54fd86c
Add IDR query metadata
bbimber Jul 17, 2024
36c90b8
Refactor components to allow re-use
bbimber Jul 19, 2024
90d4005
Merge discvr-24.3 to discvr-24.7
bbimber Jul 20, 2024
366fdd3
Merge pull request #168 from bimberlabinternal/24.3_mccdashboard
bbimber Jul 20, 2024
dba9a65
Merge pull request #167 from bimberlabinternal/24.7_fb_merge
bbimber Jul 21, 2024
a83cd37
Improve code behind MCC animal rename
bbimber Jul 23, 2024
a6818ca
Merge discvr-24.3 to discvr-24.7
bbimber Jul 24, 2024
9728472
Merge pull request #169 from bimberlabinternal/24.7_fb_merge
bbimber Jul 24, 2024
ec8a353
Update MCC npm versions
bbimber Jul 24, 2024
5fb42f2
Merge pull request #170 from bimberlabinternal/24.7_fb_u24
bbimber Jul 24, 2024
51828a8
Merge discvr-24.7 to develop
bbimber Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions IDR/resources/queries/bimber_data/pvl.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="pvl" tableDbType="TABLE">
<tableTitle>IDR PVL Data</tableTitle>
<columns>
<column columnName="i_Rh">
<columnTitle>Subject Id</columnTitle>
<fk>
<fkDbSchema>bimber_data</fkDbSchema>
<fkTable>subjects</fkTable>
<fkColumnName>Rh</fkColumnName>
<fkDisplayColumnName>Rh</fkDisplayColumnName>
</fk>
</column>
<column columnName="d_PVLDate">
<columnTitle>PVL Date</columnTitle>
</column>
<column columnName="c_PVL">
<columnTitle>PVL</columnTitle>
</column>
<column columnName="Comment">
<columnTitle>Comment</columnTitle>
</column>
<column columnName="user">
<columnTitle>User</columnTitle>
</column>
<column columnName="DateCreated">
<columnTitle>Date Created</columnTitle>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
13 changes: 13 additions & 0 deletions IDR/resources/queries/bimber_data/pvl/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="false">
<columns>
<column name="i_Rh/Cohort"/>
<column name="i_Rh"/>
<column name="d_PVLDate"/>
<column name="c_PVL"/>
<column name="comment"/>
</columns>
<sorts>
<sort column="i_Rh"/>
<sort column="d_PVLDate"/>
</sorts>
</customView>
107 changes: 107 additions & 0 deletions IDR/resources/queries/bimber_data/subjects.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="subjects" tableDbType="TABLE">
<tableTitle>IDR Subjects</tableTitle>
<columns>
<column columnName="ID">
<columnTitle>ID</columnTitle>
<isHidden>true</isHidden>
</column>
<column columnName="species">
<columnTitle>Species</columnTitle>
</column>
<column columnName="Rh">
<columnTitle>SubjectId</columnTitle>
</column>
<column columnName="Cohort">
<columnTitle>Cohort</columnTitle>
</column>
<column columnName="Hansen">
<columnTitle>Hansen</columnTitle>
<isHidden>true</isHidden>
</column>
<column columnName="PI">
<columnTitle>PI</columnTitle>
</column>
<column columnName="cohort_ID">
<columnTitle>Cohort ID</columnTitle>
</column>
<column columnName="comment">
<columnTitle>Comment</columnTitle>
</column>
<column columnName="subcohort">
<columnTitle>Subcohort</columnTitle>
</column>
<column columnName="grp">
<columnTitle>Group</columnTitle>
</column>
<column columnName="grp_order">
<columnTitle>Group Order</columnTitle>
</column>
<column columnName="grp_id">
<columnTitle>Group ID</columnTitle>
<isHidden>true</isHidden>
</column>
<column columnName="grp_note">
<columnTitle>Group Note</columnTitle>
</column>
<column columnName="rhCode">
<columnTitle>Rhesus Code</columnTitle>
</column>
<column columnName="grpnm">
<columnTitle>Group Num</columnTitle>
</column>
<column columnName="Sex">
<columnTitle>Sex</columnTitle>
</column>
<column columnName="cur_weight">
<columnTitle>Current Weight</columnTitle>
</column>
<column columnName="cohortStart">
<columnTitle>Cohort Start</columnTitle>
</column>
<column columnName="cohortEnd">
<columnTitle>Cohort End</columnTitle>
</column>
<column columnName="D0">
<columnTitle>D0</columnTitle>
</column>
<column columnName="DPC0">
<columnTitle>DPC0</columnTitle>
</column>
<column columnName="contprog">
<columnTitle>contprog</columnTitle>
</column>
<column columnName="PID0">
<columnTitle>PID0</columnTitle>
</column>
<column columnName="DPT0">
<columnTitle>DPT0</columnTitle>
</column>
<column columnName="Birth">
<columnTitle>Birth</columnTitle>
</column>
<column columnName="Nx_date">
<columnTitle>Nx Date</columnTitle>
</column>
<column columnName="stims">
<columnTitle>Stims</columnTitle>
</column>
<column columnName="protocol">
<columnTitle>Protocol</columnTitle>
</column>
<column columnName="project">
<columnTitle>Project</columnTitle>
</column>
<column columnName="iacuc_pi">
<columnTitle>IACUC PI</columnTitle>
</column>
<column columnName="active">
<columnTitle>Active?</columnTitle>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
19 changes: 19 additions & 0 deletions IDR/resources/queries/bimber_data/subjects/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="false">
<columns>
<column name="Cohort"/>
<column name="Rh"/>
<column name="Comment"/>
<column name="rhCode"/>
<column name="Sex"/>
<column name="cohortStart"/>
<column name="cohortEnd"/>
<column name="D0"/>
<column name="DPC0"/>
<column name="PID0"/>
<column name="Nx_date"/>
</columns>
<sorts>
<sort column="Cohort"/>
<sort column="Rh"/>
</sorts>
</customView>
78 changes: 78 additions & 0 deletions IDR/resources/queries/bimber_data/vacc.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="vacc" tableDbType="TABLE">
<tableTitle>IDR Vaccinations</tableTitle>
<columns>
<column columnName="id">
<columnTitle>ID</columnTitle>
<isHidden>true</isHidden>
</column>
<column columnName="rh">
<columnTitle>SubjectId</columnTitle>
<fk>
<fkDbSchema>bimber_data</fkDbSchema>
<fkTable>subjects</fkTable>
<fkColumnName>Rh</fkColumnName>
<fkDisplayColumnName>Rh</fkDisplayColumnName>
</fk>
</column>
<column columnName="vacc_date">
<columnTitle>Vaccine Date</columnTitle>
</column>
<column columnName="prick">
<columnTitle>Type</columnTitle>
</column>
<column columnName="dose">
<columnTitle>Dose</columnTitle>
</column>
<column columnName="route">
<columnTitle>Route</columnTitle>
</column>
<column columnName="admin_loc">
<columnTitle>Administration Location</columnTitle>
</column>
<column columnName="stock_date">
<columnTitle>Stock Date</columnTitle>
</column>
<column columnName="take">
<columnTitle>Take?</columnTitle>
</column>
<column columnName="shed_status">
<columnTitle>Shed Status</columnTitle>
</column>
<column columnName="vector_entry">
<columnTitle>Vector Entry</columnTitle>
</column>
<column columnName="vc_vector_id">
<columnTitle>Vector ID</columnTitle>
</column>
<column columnName="name">
<columnTitle>Vaccine Name</columnTitle>
</column>
<column columnName="backbone">
<columnTitle>Backbone</columnTitle>
</column>
<column columnName="virus_species">
<columnTitle>Virus Species</columnTitle>
</column>
<column columnName="ag_source">
<columnTitle>Antigen Source</columnTitle>
</column>
<column columnName="orf">
<columnTitle>ORF</columnTitle>
</column>
<column columnName="comment">
<columnTitle>Comment</columnTitle>
</column>
<column columnName="created">
<columnTitle>Created</columnTitle>
</column>
<column columnName="edited">
<columnTitle>edited</columnTitle>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
21 changes: 21 additions & 0 deletions IDR/resources/queries/bimber_data/vacc/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="false">
<columns>
<column name="rh/Cohort"/>
<column name="rh"/>
<column name="name"/>
<column name="vacc_date"/>
<column name="prick"/>
<column name="dose"/>
<column name="route"/>
<column name="admin_loc"/>
<column name="take"/>
<column name="backbone"/>
<column name="orf"/>
<column name="ag_source"/>
<column name="comment"/>
</columns>
<sorts>
<sort column="rh"/>
<sort column="vacc_date"/>
</sorts>
</customView>
2 changes: 1 addition & 1 deletion mcc/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = {
'^.+\\.tsx?$': [
'ts-jest',
{
tsconfig: 'node_modules/@labkey/build/webpack/tsconfig.json',
isolatedModules: true
}
],
},
Expand Down
Loading