Update for Public Rates with Correction of Labels

LabKey · May 28, 2024 · 9ba9af5 · 9ba9af5
1 parent 83833c3
commit 9ba9af5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates.sql b/onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates.sql
@@ -5,7 +5,7 @@ Assoicated xml os NIHIndustryRates.query.xml
 */
 PARAMETERS (MARGIN FLOAT DEFAULT .25, FARATE FLOAT DEFAULT 1)
 Select
-    'Industrial Rate' as SheetSelected,
+    'Industrial Rate' as RateSheetSelected,
     Margin  as MarginSelected,
     FARate as FARateSelected,
     n.category,

diff --git a/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet.query.xml b/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet.query.xml
@@ -10,7 +10,7 @@
 
                     <column columnName="category" />
                     <column columnName="name" />
-                    <column columnName="unitCost">
+                    <column columnName="CurrentYear">
                         <columnTitle>Yr 65: Current Year</columnTitle>
                         <formatString>$#,##0.00</formatString>
                     </column>

diff --git a/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet.sql b/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet.sql
@@ -11,6 +11,7 @@ select
 category,
 name,
 UnitCost,
+(UnitCost *(1.475 / (1 ))) as CurrentYear,
 year1,
 year2,
 year3,

diff --git a/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml b/onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml
@@ -9,7 +9,7 @@
         </column>
         <column name="category"/>
         <column name="Name"/>
-        <column name = "unitCost">
+        <column name = "CurrentYear">
             <properties>
                 <property name="columnTitle" value="Yr 65: Current Year"/>
             </properties>
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ select @@
     category,
     name,
     UnitCost,
+    (UnitCost *(1.475 / (1 ))) as CurrentYear,
     year1,
     year2,
     year3,
@@ Expand Down @@