Skip to content

Commit f9cc41e

Browse files
jonesgaohsujonesgaohsu
authored
Update of XML Labels for Public Rate SHeets (#1341)
* Update of XML Labels for Public Rate SHeets * Upddate of qview.xml for Public Rate sheets. Insured that the Firsdt rate displayed is for the column titled CurrentYear which is the NIH Rate (Unit Cost) times the applied parameters * Update of qview.xml for NIH Rate the first year should use the unit cost not the Current Year field.
1 parent ec63130 commit f9cc41e

3 files changed

Lines changed: 70 additions & 77 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

0 commit comments

Comments
 (0)