Skip to content

Commit d513d6f

Browse files
bbimberbbimber
authored
Merge pull request #176 from LabKey/fb_merge_23.7_to_develop
Merge discvr-23.7 to develop
2 parents 2fa22fa + 26eac1f commit d513d6f

57 files changed

Lines changed: 10703 additions & 7764 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.

‎IDR/resources/referenceStudy/folder.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<folder archiveVersion="22.0" xmlns="http://labkey.org/folder/xml">
3+
<study dir="study"/>
4+
</folder>

‎IDR/resources/referenceStudy/study/README‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
This folder contains the reference study for IDR data. It should be generated by performing
2+
a folder export from the production server, then copying the datasets_manifest.xml, datasets_metadata.xml,
3+
PrimateElectronicHealthRecord.dataset and study.xml files. After copying, the following can be used to find/replace
4+
metadata in datasets_metadata.xml to remove unwanted information:
5+
6+
Replace the following regex expressions with empty string:
7+
8+
( )*<inputType>(.*)</inputType>\n
9+
( )*<isHidden>(.*)</isHidden>\n|( )*<shownIn(.*)View>(.*)</shownIn(.*)View>\n
10+
( )*<url>(.*)</url>\n|( )*<description>(.*)</description>\n|( )*<facetingBehavior>(.*)</facetingBehavior>\n|( )*<nullable>(.*)</nullable>\n
11+
( )*<formatString>(.*)</formatString>\n|( )*<columnTitle>(.*)</columnTitle>\n|( )*<fk>(.)*\n( )*<fk(.)*\n( )*<fk(.)*\n( )*<fk(.)*\n( )*</fk>(.)*\n
12+
( )*<dimension>(.*)</dimension>\n|( )*<measure>(.*)</measure>\n|( )*<isMvEnabled>(.*)</isMvEnabled>\n

mGAP/resources/referenceStudy/datasets/mGAP.datasets renamed to IDR/resources/referenceStudy/study/datasets/IDR.dataset

File renamed without changes.

‎IDR/resources/referenceStudy/study/datasets/datasets_manifest.xml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<datasets metaDataFile="datasets_metadata.xml" xmlns="http://labkey.org/study/xml">
3+
<datasets>
4+
<dataset name="flags" id="5019" category="Colony Management" type="Standard">
5+
<tags/>
6+
</dataset>
7+
<dataset name="parentage" id="5025" showByDefault="true" category="Colony Management" type="Standard">
8+
<tags/>
9+
</dataset>
10+
<dataset name="birth" id="1007" category="Colony Management" demographicData="true" type="Standard">
11+
<tags/>
12+
</dataset>
13+
<dataset name="encounters" id="1067" showByDefault="false" category="Clinical" type="Standard">
14+
<tags/>
15+
</dataset>
16+
<dataset name="medicationOrders" id="1037" showByDefault="false" category="Clinical" type="Standard">
17+
<tags/>
18+
</dataset>
19+
<dataset name="treatment_order" id="5056" showByDefault="false" category="Clinical" type="Standard">
20+
<tags/>
21+
</dataset>
22+
<dataset name="clinremarks" id="1047" showByDefault="false" category="Clinical" type="Standard">
23+
<tags/>
24+
</dataset>
25+
<dataset name="medicationAdministration" id="1014" category="Clinical" type="Standard">
26+
<tags/>
27+
</dataset>
28+
<dataset name="weight" id="1045" showByDefault="true" category="Clinical" type="Standard">
29+
<tags/>
30+
</dataset>
31+
<dataset name="labwork" id="1073" showByDefault="false" category="ClinPath" type="Standard">
32+
<tags/>
33+
</dataset>
34+
<dataset name="labworkResults" id="1074" showByDefault="false" category="ClinPath" type="Standard">
35+
<tags/>
36+
</dataset>
37+
<dataset name="transfers" id="1001" category="Colony Management" type="Standard">
38+
<tags/>
39+
</dataset>
40+
<dataset name="deaths" id="1048" showByDefault="true" category="Colony Management" demographicData="true" type="Standard">
41+
<tags/>
42+
</dataset>
43+
<dataset name="demographics" id="1012" category="Colony Management" demographicData="true" type="Standard">
44+
<tags/>
45+
</dataset>
46+
<dataset name="departure" id="1013" showByDefault="true" category="Colony Management" type="Standard">
47+
<tags/>
48+
</dataset>
49+
<dataset name="assignment" id="1002" category="Colony Management" type="Standard">
50+
<tags/>
51+
</dataset>
52+
<dataset name="problem" id="1030" showByDefault="false" category="Clinical" type="Standard">
53+
<tags/>
54+
</dataset>
55+
<dataset name="housing" id="1018" category="Colony Management" type="Standard">
56+
<tags/>
57+
</dataset>
58+
<dataset name="clinical_observations" id="5006" showByDefault="true" category="Clinical" type="Standard">
59+
<tags/>
60+
</dataset>
61+
<dataset name="kinship" id="5007" showByDefault="true" category="Colony Management" type="Standard">
62+
<tags/>
63+
</dataset>
64+
<dataset name="samples" id="1031" showByDefault="true" category="Research" type="Standard">
65+
<tags/>
66+
</dataset>
67+
<dataset name="viralLoads" id="1032" showByDefault="true" category="Research" type="Standard">
68+
<tags/>
69+
</dataset>
70+
</datasets>
71+
</datasets>

0 commit comments

Comments
 (0)