From 9ba9af592297524a26dd6e9933078f6552710176 Mon Sep 17 00:00:00 2001
From: Gary Jones <jonesga@ohsu.edu>
Date: Tue, 28 May 2024 13:43:26 -0700
Subject: [PATCH] Update for Public Rates with Correction of Labels

---
 .../resources/queries/onprc_billing_public/NIHIndustryRates.sql | 2 +-
 .../queries/onprc_billing_public/NIHRateSheet.query.xml         | 2 +-
 .../resources/queries/onprc_billing_public/NIHRateSheet.sql     | 1 +
 .../queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates.sql b/onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates.sql
index ac956c9b0..4bd554030 100644
--- 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
index 5957e7bb4..a32d12bc0 100644
--- 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
index a5edb4d3c..52d81ac52 100644
--- 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
index 35dbe0c65..433dba938 100644
--- 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>