Skip to content

Commit fdee154

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 23.3 to 23.7
2 parents 8e0f8b5 + 5fefd60 commit fdee154

3 files changed

Lines changed: 112 additions & 1 deletion

File tree

‎onprc_ehr/resources/etls/mfshtoRandalData_2024_01.xml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<!--TGHis was updated to change the naming of steps to be seu7ential-->
2+
<etl xmlns="http://labkey.org/etl/xml">
3+
<name>mfshToRandalData_2024</name>
4+
<description>imports the data from mfsh animal details on ONPRC</description>
5+
<transforms>
6+
<transform id="step1">
7+
<description>Define Hansen Study Animals 2022</description>
8+
<source queryName="studyAnimals" schemaName="Randal_data"/>
9+
<destination queryName="StudyDetails_RandalData" schemaName="Onprc_ehr" targetOption="truncate"/>
10+
</transform>
11+
<transform id="step2">
12+
<description>Export Query to File Share</description>
13+
<source queryName="RandData_AnimalGroups" schemaName="onprc_ehr"/>
14+
<destination dir="hansenFiles" fileBaseName="AnimalGroups-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
15+
</transform>
16+
<transform id="step3">
17+
<description>Export Query to File Share</description>
18+
<source queryName="RandData_blood" schemaName="onprc_ehr"/>
19+
<destination dir="hansenFiles" fileBaseName="BloodDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
20+
</transform>
21+
<transform id="step4">
22+
<description>Export Query to File Share</description>
23+
<source queryName="RandData_birth" schemaName="onprc_ehr"/>
24+
<destination dir="hansenFiles" fileBaseName="BirthDetails-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
25+
</transform>
26+
<transform id="step5">
27+
<description>Export Query to File Share</description>
28+
<source queryName="RandData_assignment" schemaName="onprc_ehr"/>
29+
<destination dir="hansenFiles" fileBaseName="assignment-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
30+
</transform>
31+
<transform id="step6">
32+
<description>Export Query to File Share</description>
33+
<source queryName="RandData_arrival" schemaName="onprc_ehr"/>
34+
<destination dir="hansenFiles" fileBaseName="arrival-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
35+
</transform>
36+
<transform id="step7">
37+
<description>Export Query to File Share</description>
38+
<source queryName="RandData_weights" schemaName="onprc_ehr"/>
39+
<destination dir="hansenFiles" fileBaseName="weights-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
40+
</transform>
41+
<transform id="step8">
42+
<description>Export Query to File Share</description>
43+
<source queryName="RandData_Cases" schemaName="onprc_ehr"/>
44+
<destination dir="hansenFiles" fileBaseName="Cases-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
45+
</transform>
46+
<transform id="step9">
47+
<description>Export Query to File Share</description>
48+
<source queryName="RandData_clinremarks" schemaName="onprc_ehr"/>
49+
<destination dir="hansenFiles" fileBaseName="clinremarks-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
50+
</transform>
51+
<transform id="step10">
52+
<description>Export Query to File Share</description>
53+
<source queryName="RandData_demographics" schemaName="onprc_ehr"/>
54+
<destination dir="hansenFiles" fileBaseName="demographics-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
55+
</transform>
56+
<transform id="step11">
57+
<description>Export Query to File Share</description>
58+
<source queryName="RandData_deaths" schemaName="onprc_ehr"/>
59+
<destination dir="hansenFiles" fileBaseName="deaths-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
60+
</transform>
61+
<transform id="step12">
62+
<description>Export Query to File Share</description>
63+
<source queryName="RandData_departure" schemaName="onprc_ehr"/>
64+
<destination dir="hansenFiles" fileBaseName="departure-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
65+
</transform>
66+
<transform id="step13">
67+
<description>Export Query to File Share</description>
68+
<source queryName="RandData_drug" schemaName="onprc_ehr"/>
69+
<destination dir="hansenFiles" fileBaseName="drug-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
70+
</transform>
71+
<transform id="step14">
72+
<description>Export Query to File Share</description>
73+
<source queryName="RandData_flags" schemaName="onprc_ehr"/>
74+
<destination dir="hansenFiles" fileBaseName="flags-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
75+
</transform>
76+
<transform id="step15">
77+
<description>Export Query to File Share</description>
78+
<source queryName="RandData_Hematology" schemaName="onprc_ehr"/>
79+
<destination dir="hansenFiles" fileBaseName="Hematology-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
80+
</transform>
81+
<transform id="step16">
82+
<description>Export Query to File Share</description>
83+
<source queryName="RandData_Housing" schemaName="onprc_ehr"/>
84+
<destination dir="hansenFiles" fileBaseName="Housing-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
85+
</transform>
86+
<transform id="step17">
87+
<description>Export Query to File Share Project</description>
88+
<source queryName="project" schemaName="pf_ehrData"/>
89+
<destination dir="hansenFiles" fileBaseName="Projects-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
90+
</transform>
91+
<transform id="step18">
92+
<description>Export Query to File Share Protocols</description>
93+
<source queryName="protocol" schemaName="pf_ehrData"/>
94+
<destination dir="hansenFiles" fileBaseName="Protocol-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
95+
</transform>
96+
<transform id="step19">
97+
<description>Export Query to File Share</description>
98+
<source queryName="RandalData_bcs" schemaName="onprc_ehr"/>
99+
<destination dir="hansenFiles" fileBaseName="Notes-${TransformRunId}-${Timestamp}" fileExtension="csv" type="file"/>
100+
</transform>
101+
</transforms>
102+
<schedule>
103+
<!--5AM-->
104+
<cron expression="0 0 05 * * ?"/>
105+
</schedule>
106+
</etl>

‎onprc_ehr/resources/scripts/onprc_ehr/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ONPRC_EHR.Utils = new function(){
105105
if (!row.remark){
106106
EHR.Server.Utils.addError(scriptErrors, cageField, 'You are required to enter a remark', 'INFO');
107107
EHR.Server.Utils.addError(scriptErrors, 'Id', 'You are required to enter a remark', 'INFO');
108-
EHR.Server.Utils.addError(scriptErrors, 'remark', 'A remark is required because of the case size errors.', 'WARN');
108+
EHR.Server.Utils.addError(scriptErrors, 'remark', 'A remark is required because of the cage size errors.', 'WARN');
109109
}
110110
}
111111
}

‎onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,7 @@ public List<String> verifyCageSize(String room, String cage, List<Double> weight
912912
List<String> ret = new ArrayList<>();
913913
Double availableSqFt = cageRow.getSqFt();
914914
Double availableHeight = cageRow.getHeight();
915+
String dividername = cageRow.getDividerName();
915916

916917
Double requiredSqFt = 0.0;
917918
for (Double w : weights)
@@ -922,7 +923,11 @@ public List<String> verifyCageSize(String room, String cage, List<Double> weight
922923
requiredSqFt += s;
923924
}
924925
}
926+
if ("No Slide".equalsIgnoreCase(dividername))
927+
{
928+
availableSqFt = availableSqFt * 2;
925929

930+
}
926931
if (requiredSqFt > availableSqFt)
927932
{
928933
ret.add("These animals are too LARGE for this cage. Has " + Math.round(availableSqFt) + " sq ft. Requires " + Math.round(requiredSqFt) + ".");

0 commit comments

Comments
 (0)