Skip to content

Commit

Permalink
Merge 24.3 to 24.7
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-teamcity committed Sep 16, 2024
2 parents 9d81f2f + 991317d commit 5a5de09
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 7 deletions.
242 changes: 242 additions & 0 deletions onprc_ehr/resources/queries/study/Demographics.query.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="Demographics" tableDbType="TABLE" useColumnOrder="true">
<tableUrl />
<insertUrl />
<importUrl />
<updateUrl />
<deleteUrl />
<columns>
<column columnName="Id">
<!--<isKeyField>true</isKeyField>-->
</column>
<column columnName="date">
<isHidden>true</isHidden>
</column>
<column columnName="project">
<isHidden>true</isHidden>
</column>
<column columnName="gender">
<columnTitle>Sex</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>gender_codes</fkTable>
<fkColumnName>code</fkColumnName>
</fk>
</column>
<column columnName="species">
<columnTitle>Species</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>species</fkTable>
<fkColumnName>common</fkColumnName>
<fkDisplayColumnName useRawValue="true"/>
</fk>
</column>
<column columnName="geographic_origin">
<columnTitle>Geographic Origin</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>geographic_origins</fkTable>
<fkColumnName>meaning</fkColumnName>
<fkDisplayColumnName useRawValue="true"/>
</fk>
</column>
<column columnName="birth">
<!--<shownInInsertView>false</shownInInsertView>-->
<formatString>Date</formatString>
<columnTitle>Birth</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Birth&amp;
query.Id~eq=${Id}
</url>
</column>
<column columnName="death">
<!--<shownInInsertView>false</shownInInsertView>-->
<formatString>Date</formatString>
<columnTitle>Death</columnTitle>
<url>/query/executeQuery.view?
schemaName=study&amp;
query.queryName=Deaths&amp;
query.Id~eq=${Id}
</url>
</column>
<column columnName="status">
<shownInInsertView>false</shownInInsertView>
<isHidden>true</isHidden>
<columnTitle>Status</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>status_codes</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="calculated_status">
<shownInInsertView>false</shownInInsertView>
<columnTitle>Status</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>calculated_status_codes</fkTable>
<fkColumnName>code</fkColumnName>
</fk>
</column>
<column columnName="remark">

</column>
<column columnName="QCState">
<columnTitle>Record Status</columnTitle>
<isHidden>true</isHidden>
</column>

<!--NOTE: being deprecated-->
<column columnName="avail">
<isHidden>true</isHidden>
<columnTitle>Availability</columnTitle>
<!--<fk>-->
<!--<fkDbSchema>ehr_lookups</fkDbSchema>-->
<!--<fkTable>avail_codes</fkTable>-->
<!--<fkColumnName>code</fkColumnName>-->
<!--</fk>-->
</column>
<column columnName="hold">
<columnTitle>Hold</columnTitle>
<!--<fk>-->
<!--<fkDbSchema>ehr_lookups</fkDbSchema>-->
<!--<fkTable>hold_codes</fkTable>-->
<!--<fkColumnName>code</fkColumnName>-->
<!--</fk>-->
</column>
<column columnName="dam">
<columnTitle>Dam</columnTitle>
<!--<fk>-->
<!--<fkDbSchema>study</fkDbSchema>-->
<!--<fkTable>animal</fkTable>-->
<!--<fkColumnName>id</fkColumnName>-->
<!--</fk>-->
<url>/ehr/participantView.view?participantId=${dam}</url>
</column>
<column columnName="sire">
<columnTitle>Sire</columnTitle>
<!--<fk>-->
<!--<fkDbSchema>study</fkDbSchema>-->
<!--<fkTable>animal</fkTable>-->
<!--<fkColumnName>id</fkColumnName>-->
<!--</fk>-->
<url>/ehr/participantView.view?participantId=${sire}</url>
</column>
<column columnName="origin">
<columnTitle>Origin</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>source</fkTable>
<fkColumnName>code</fkColumnName>
</fk>
</column>

<!--NOTE: being deprecated-->
<column columnName="arrivedate">
<isHidden>true</isHidden>
<formatString>DateTime</formatString>
<shownInInsertView>false</shownInInsertView>
<columnTitle>Arrival Date</columnTitle>
</column>
<column columnName="departdate">
<isHidden>true</isHidden>
<formatString>DateTime</formatString>
<shownInInsertView>false</shownInInsertView>
<columnTitle>Departure Date</columnTitle>
</column>
<column columnName="room">
<isHidden>true</isHidden>
<shownInInsertView>false</shownInInsertView>
<columnTitle>Room</columnTitle>
<url>/ehr/cageDetails.view?
room=${room}&amp;
</url>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>rooms</fkTable>
<fkColumnName>room</fkColumnName>
</fk>
</column>
<column columnName="cage">
<isHidden>true</isHidden>
<shownInInsertView>false</shownInInsertView>
<columnTitle>Cage</columnTitle>
<url>/ehr/cageDetails.view?
room=${room}&amp;
cage=${cage}&amp;
</url>
</column>
<column columnName="cond">
<isHidden>true</isHidden>
<shownInInsertView>false</shownInInsertView>
<displayWidth>30</displayWidth>
<columnTitle>Condition</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>housing_condition_codes</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="weight">
<isHidden>true</isHidden>
<shownInInsertView>false</shownInInsertView>
<columnTitle>Current Weight (kg)</columnTitle>
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=Weight&amp;
query.id~eq=${id}
</url>
</column>
<!--NOTE: being deprecated-->
<column columnName="wdate">
<shownInInsertView>false</shownInInsertView>
<isHidden>true</isHidden>
<formatString>DateTime</formatString>
<columnTitle>Weight Date</columnTitle>
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=Weight&amp;
query.id~eq=${id}&amp;
query.date~eq=${wdate}
</url>
</column>
<column columnName="tbdate">
<shownInInsertView>false</shownInInsertView>
<isHidden>true</isHidden>
<formatString>Date</formatString>
<columnTitle>Last TB Date</columnTitle>
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=TB Tests&amp;
query.id~eq=${id}&amp;
query.sort=-Date
</url>
</column>
<column columnName="medical">
<columnTitle>Medical</columnTitle>
</column>
<column columnName="prepaid">
<columnTitle>Replacement Prepaid By</columnTitle>
</column>
<column columnName="v_status">
<columnTitle>Viral Status</columnTitle>
<isHidden>true</isHidden>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>viral_status</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="parentid">
<!--<fk>-->
<!--<fkDbSchema>study</fkDbSchema>-->
<!--<fkTable>studyDataParent</fkTable>-->
<!--<fkColumnName>objectid</fkColumnName>-->
<!--</fk>-->
</column>
</columns>
</table>
</tables>
</metadata>
</query>
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/birth.query.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<isMvEnabled>true</isMvEnabled>
</column>
<column columnName="gender">
<columnTitle>Gender</columnTitle>
<columnTitle>Sex</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>gender_codes</fkTable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<isHidden>false</isHidden>
</column>
<column columnName="gender">
<columnTitle>Gender</columnTitle>
<columnTitle>Sex</columnTitle>
</column>
<column columnName="species">
<columnTitle>Speices</columnTitle>
<columnTitle>Species</columnTitle>
</column>
<column columnName="yoa">
<columnTitle>Year of Birth</columnTitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</fk>
</column>
<column columnName="offspringgender">
<columnTitle>Gender</columnTitle>
<columnTitle>Sex</columnTitle>
</column>
<column columnName="birth">
<columnTitle>Birth</columnTitle>
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/schemas/onprc_ehr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@
<columnTitle>Species</columnTitle>
</column>
<column columnName="gender">
<columnTitle>Gender</columnTitle>
<columnTitle>Sex</columnTitle>
</column>
<column columnName="ageclass">
<columnTitle>Age Class</columnTitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Ext4.define('ONPRC_EHR.panel.AnimalDetailsPanel', {
fieldLabel: 'Last Recorded Location', //Added: 12-19-2018 R.Blasa
name: 'lastlocation'
},{
fieldLabel: 'Gender',
fieldLabel: 'Sex',
name: 'gender'
},{
fieldLabel: 'Species',
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/web/onprc_ehr/panel/SnapshotPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Ext4.define('onprc_ehr.panel.SnapshotPanel', {
name: 'calculated_status'
},{
xtype: 'displayfield',
fieldLabel: 'Gender',
fieldLabel: 'Sex',
name: 'gender'
},{
xtype: 'displayfield',
Expand Down

0 comments on commit 5a5de09

Please sign in to comment.