Skip to content

Commit 374e6b4

Browse files
OhsudevOhsudev
authored
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_ssrsSessionId
2 parents dd6ca6d + d1cdf17 commit 374e6b4

26 files changed

Lines changed: 627 additions & 345 deletions

File tree

‎onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates/.qview.xml‎

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,62 @@
1-
<!--Update to year63 and beyond-->
21
<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="NIH Industry Rate Sheet">
32
<columns>
43
<column name="RateSheetSelected"/>
5-
<column name="MarginSelected"/>
6-
<column name="FARateSelected"/>
74

85
<column name="category"/>
96
<column name="Name"/>
107
<column name = "CurrentYear">
11-
<!-- <properties>
12-
<property name="columnTitle" value="YR65: Current Year"/>
13-
14-
</properties>-->
8+
<properties>
9+
<property name="columnTitle" value="YR66: Current Year"/>
10+
</properties>
1511
</column>
16-
<column name = "year1">
17-
<properties>
18-
<property name="columnTitle" value="YR66: 5/1/25-4/30/26"/>
1912

20-
</properties>
21-
</column>
22-
<column name = "year2">
23-
<properties>
24-
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
25-
</properties>
26-
</column>
27-
<column name = "year3">
28-
<properties>
29-
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
30-
</properties>
31-
</column>
32-
<column name = "year4">
33-
<properties>
34-
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
35-
</properties>
36-
</column>
37-
<column name = "year5">
38-
<properties>
39-
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
40-
</properties>
41-
</column>
42-
<column name = "year6">
43-
<properties>
44-
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
45-
</properties>
46-
</column>
47-
<column name = "year7">
48-
<properties>
49-
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
50-
</properties>
51-
</column>
52-
<column name = "year8">
53-
<properties>
54-
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
55-
</properties>
56-
</column>
13+
<column name = "year1">
14+
<properties>
15+
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
16+
</properties>
17+
</column>
18+
<column name = "year2">
19+
<properties>
20+
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
21+
</properties>
22+
</column>
23+
<column name = "year3">
24+
<properties>
25+
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
26+
</properties>
27+
</column>
28+
<column name = "year4">
29+
<properties>
30+
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
31+
</properties>
32+
</column>
33+
<column name = "year5">
34+
<properties>
35+
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
36+
</properties>
37+
</column>
38+
<column name = "year6">
39+
<properties>
40+
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
41+
</properties>
42+
</column>
43+
<column name = "year7">
44+
<properties>
45+
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
46+
</properties>
47+
</column>
48+
<column name = "year8">
49+
<properties>
50+
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
51+
</properties>
52+
</column>
5753

5854

59-
<column name = "DatePosted">
60-
<properties>
61-
<property name="columnTitle" value="Date Calculated"/>
62-
</properties>
63-
</column>
55+
<column name = "DatePosted">
56+
<properties>
57+
<property name="columnTitle" value="Date Calculated"/>
58+
</properties>
59+
</column>
6460

6561
</columns>
6662
<sorts>

‎onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet/.qview.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,50 @@
44

55
<column name="category"/>
66
<column name="Name"/>
7-
<column name = "unitCost">
7+
<column name = "UnitCost">
88
<properties>
9-
<property name="columnTitle" value="YR65: Current Year"/>
9+
<property name="columnTitle" value="YR66: Current Year"/>
1010
</properties>
1111
</column>
12+
1213
<column name = "year1">
1314
<properties>
14-
<property name="columnTitle" value="YR66: 5/1/25-4/30/26"/>
15+
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
1516
</properties>
1617
</column>
1718
<column name = "year2">
1819
<properties>
19-
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
20+
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
2021
</properties>
2122
</column>
2223
<column name = "year3">
2324
<properties>
24-
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
25+
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
2526
</properties>
2627
</column>
2728
<column name = "year4">
2829
<properties>
29-
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
30+
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
3031
</properties>
3132
</column>
3233
<column name = "year5">
3334
<properties>
34-
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
35+
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
3536
</properties>
3637
</column>
3738
<column name = "year6">
3839
<properties>
39-
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
40+
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
4041
</properties>
4142
</column>
4243
<column name = "year7">
4344
<properties>
44-
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
45+
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
4546
</properties>
4647
</column>
4748
<column name = "year8">
4849
<properties>
49-
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
50+
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
5051
</properties>
5152
</column>
5253

‎onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,53 @@
1-
<!--LabKey22.3Beta-56-onprc.tar.gz-->
21
<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="NIH Reduced Rate Sheet">
32
<columns>
43
<column name="RateSheetSelected"/>
5-
<column name="ParameterSelected">
6-
<properties>
7-
<property name="columnTitle" value="Parameter Selected"/>
8-
</properties>
9-
</column>
4+
105
<column name="category"/>
116
<column name="Name"/>
127
<column name = "CurrentYear">
138
<properties>
14-
<property name="columnTitle" value="YR65: Current Year"/>
9+
<property name="columnTitle" value="YR66: Current Year"/>
1510
</properties>
1611
</column>
12+
1713
<column name = "year1">
1814
<properties>
19-
<property name="columnTitle" value="YR66: 5/1/25-4/30/26"/>
15+
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
2016
</properties>
2117
</column>
2218
<column name = "year2">
2319
<properties>
24-
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
20+
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
2521
</properties>
2622
</column>
2723
<column name = "year3">
2824
<properties>
29-
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
25+
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
3026
</properties>
3127
</column>
3228
<column name = "year4">
3329
<properties>
34-
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
30+
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
3531
</properties>
3632
</column>
3733
<column name = "year5">
3834
<properties>
39-
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
35+
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
4036
</properties>
4137
</column>
4238
<column name = "year6">
4339
<properties>
44-
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
40+
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
4541
</properties>
4642
</column>
4743
<column name = "year7">
4844
<properties>
49-
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
45+
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
5046
</properties>
5147
</column>
5248
<column name = "year8">
5349
<properties>
54-
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
50+
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
5551
</properties>
5652
</column>
5753

‎onprc_ehr/resources/etls/PrimaToPrime.xml‎

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--Copy Prima tables into Prime. Runs daily at 3AM -->
3-
<!--Added By Kollil, 7/26/2021 -->
2+
<!--Copy Prima tables into Prime. Runs daily at 9am and 5pm, Refer to tkt #11937 -->
3+
<!--Added By Kollil, 7/26/2021 , Modified by Kollil, 03-02-2025-->
44
<!--NOTES: The source DB name is "Prima" in production and "PrimaTest" on other servers -->
55

66
<etl xmlns="http://labkey.org/etl/xml">
77
<name>PrimatoPrime</name>
8-
<description>Transfers data from the Prima tables to the Prime tables in ONPRC_EHR</description>
8+
<description>Transfers data from the Prima tables to the Prime in ONPRC_EHR</description>
99
<transforms>
1010
<transform id="step1a">
11-
<description>Transfer to UserPersons</description>
12-
<source queryName="UserPersons" schemaName="Prima"/>
13-
<destination queryName="Prima_UserPersons" schemaName="ONPRC_EHR" targetOption="truncate"/>
11+
<description>Transfer CassetteBases into onprc_ehr table</description>
12+
<source queryName="CassetteBases" schemaName="Prima"/>
13+
<destination queryName="Prima_CassetteBases" schemaName="onprc_ehr" targetOption="truncate"/>
1414
</transform>
1515
<transform id="step2a">
16-
<description>Transfer to SurgicalWheels</description>
17-
<source queryName="SurgicalWheels" schemaName="Prima"/>
18-
<destination queryName="Prima_SurgicalWheels" schemaName="ONPRC_EHR" targetOption="truncate"/>
16+
<description>Transfer to TissueCollections</description>
17+
<source queryName="TissueCollections" schemaName="Prima"/>
18+
<destination queryName="Prima_TissueCollections" schemaName="onprc_ehr" targetOption="truncate"/>
1919
</transform>
2020
<transform id="step3a">
21-
<description>Transfer to StainTests</description>
22-
<source queryName="StainTests" schemaName="Prima"/>
23-
<destination queryName="Prima_StainTests" schemaName="ONPRC_EHR" targetOption="truncate"/>
21+
<description>Transfer to Animals</description>
22+
<source queryName="Animals" schemaName="Prima"/>
23+
<destination queryName="Prima_Animals" schemaName="onprc_ehr" targetOption="truncate"/>
2424
</transform>
2525
<transform id="step4a">
26-
<description>Transfer to SlideBases</description>
27-
<source queryName="SlideBases" schemaName="Prima"/>
28-
<destination queryName="Prima_SlideBases" schemaName="ONPRC_EHR" targetOption="truncate"/>
29-
</transform>
30-
<transform id="step5a">
3126
<description>Transfer to CaseBase</description>
3227
<source queryName="CaseBase" schemaName="Prima"/>
3328
<destination queryName="Prima_CaseBase" schemaName="ONPRC_EHR" targetOption="truncate"/>
3429
</transform>
35-
<transform id="step6a">
36-
<description>Transfer to CassetteEvents</description>
37-
<source queryName="CassetteEvents" schemaName="Prima"/>
38-
<destination queryName="Prima_CassetteEvents" schemaName="ONPRC_EHR" targetOption="truncate"/>
39-
</transform>
40-
<transform id="step7a">
41-
<description>Transfer to CassetteEventLocations</description>
42-
<source queryName="CassetteEventLocations" schemaName="Prima"/>
43-
<destination queryName="Prima_CassetteEventLocations" schemaName="ONPRC_EHR" targetOption="truncate"/>
44-
</transform>
45-
<transform id="step8a">
46-
<description>Transfer to CassetteBases</description>
47-
<source queryName="CassetteBases" schemaName="Prima"/>
48-
<destination queryName="Prima_CassetteBases" schemaName="ONPRC_EHR" targetOption="truncate"/>
49-
</transform>
50-
<transform id="step9a">
51-
<description>Transfer to LabstationTypes</description>
52-
<source queryName="LabstationTypes" schemaName="Prima"/>
53-
<destination queryName="Prima_LabstationTypes" schemaName="ONPRC_EHR" targetOption="truncate"/>
54-
</transform>
55-
<transform id="step10a">
56-
<description>Transfer to SlideEvents</description>
57-
<source queryName="SlideEvents" schemaName="Prima"/>
58-
<destination queryName="Prima_SlideEvents" schemaName="ONPRC_EHR" targetOption="truncate"/>
59-
</transform>
60-
<transform id="step11a">
61-
<description>Transfer to SlideEventLoctions</description>
62-
<source queryName="SlideEventLocations" schemaName="Prima"/>
63-
<destination queryName="Prima_SlideEventLocations" schemaName="ONPRC_EHR" targetOption="truncate"/>
64-
</transform>
30+
6531

6632
</transforms>
6733
<schedule>
68-
<!--Runs daily 3AM-->
69-
<cron expression="0 50 03 * * ?"/>
34+
<!--Runs daily 9Am and 5pm-->
35+
<cron expression="0 0 9,17 * * ?"/>
7036
</schedule>
7137

7238
</etl>

‎onprc_ehr/resources/queries/ehr_lookups/cageReview.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ LEFT JOIN (
9898
f.id,
9999
min(f.flag.value) as heightExemption
100100
FROM study.flags f
101-
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and (f.flag.value = javaConstant('org.labkey.onprc_ehr.ONPRC_EHRManager.CAGE_HEIGHT_EXEMPTION_FLAG') OR f.flag.value = javaConstant('org.labkey.onprc_ehr.ONPRC_EHRManager.CAGE_MEDICAL_EXEMPTION_FLAG'))
101+
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and f.flag.description like '%exempt%'
102102
GROUP BY f.Id
103103
) f on (f.Id = h.Id)
104104

@@ -108,7 +108,7 @@ LEFT JOIN (
108108
f.id,
109109
min(f.flag.value) as weightExemption
110110
FROM study.flags f
111-
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and (f.flag.value = javaConstant('org.labkey.onprc_ehr.ONPRC_EHRManager.CAGE_WEIGHT_EXEMPTION_FLAG') or f.flag.value = javaConstant('org.labkey.onprc_ehr.ONPRC_EHRManager.CAGE_MEDICAL_EXEMPTION_FLAG'))
111+
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and f.flag.description like '%exempt%'
112112
GROUP BY f.Id
113113
) wf on (wf.Id = h.Id)
114114

‎onprc_ehr/resources/queries/onprc_ehr/PrimaCassetteDataWithAnimalIds.sql‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
Added by Kollil April, 2025
3+
This query will join the cassette data with EHR data. Refer to tkt #11937
4+
*/
5+
Select
6+
sd.id, -- ONPRC AnimalId
7+
pc.CassetteAccessionNumber,
8+
pc.TissueType,
9+
pc.TissueTypeAbbreviation,
10+
pc.TissueAlternateIdentifier
11+
From PrimatoPrimeCassetteData pc, study.Demographics sd
12+
Where pc.id = sd.id

‎onprc_ehr/resources/queries/onprc_ehr/PrimaToPrimeCassetteData.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
Added by Kollil April, 2025
3+
This query will extract the cassette data from the ETLed db tables from Prima db. Refer to tkt #11937
4+
*/
5+
SELECT
6+
an.Identifier as Id,
7+
--an.AlternateIdentifier as AnimalAlternateIdentifier,
8+
ctb.SavedIdentifier as CassetteAccessionNumber,
9+
ctb.AlternateIdentifier as TissueAlternateIdentifier,
10+
tc.Title as TissueType,
11+
tc.Abbreviation as TissueTypeAbbreviation
12+
--cb.Id as CaseId
13+
FROM Prima_CassetteBases as ctb
14+
join Prima_TissueCollections tc on ctb.TissueCollectionId = tc.Id
15+
join Prima_CaseBase cb on cb.Id = ctb.CaseBaseId
16+
Join Prima_Animals an on cb.AnimalId = an.Id
17+
Where ctb.SavedIdentifier NOT LIKE 'IPC%'
18+
And ctb.SavedIdentifier NOT LIKE '19[0-9][0-9]%'
19+
And ctb.SavedIdentifier NOT LIKE '20[0-9][0-9]%'

0 commit comments

Comments
 (0)