Merge pull request #850 from mhines-usgs/AQCU-1773

Adjust TSS and CORR to remark about delete corrections properly
USGS-R · Mar 15, 2019 · c287924 · c287924
2 parents 7741365 + 55f34cc
commit c287924
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/R/timeseriessummary-data.R b/R/timeseriessummary-data.R
@@ -51,7 +51,7 @@ parseCustomDataElementsForTemplateForTimeSeriesSummary <- function(reportData) {
   tsDetailsTable[['tsExtAttrs']] <- formatDataTable(tsDetails[['tsExtAttrs']])
   addChangeNote <- tsDetails[['changeNote']]
 
-  advOptions <- formatAdvReportOptions(fetchReportMetadataField(reportData,'excludeCorrections'))
+  advOptions <- formatAdvReportOptions(fetchRequestParametersField(reportData,'excludedCorrections'))
 
   return(list(
       tsDetails = list(hasData=TRUE, data=tsDetailsTable, addChangeNote=addChangeNote),
@@ -949,8 +949,8 @@ checkIfStatDerived <- function(reportData, timezone){
 formatAdvReportOptions <- function(advancedReportOptions) {
   advOptions <- list()
   #handle DeleteRegion
-  if(!isEmptyOrBlank(advancedReportOptions) && identical(advancedReportOptions,"DeleteRegion,")) {
-    advOptions <- paste0(advOptions, "Delete region corrections excluded.")
+  if(!isEmptyOrBlank(advancedReportOptions) && identical(advancedReportOptions,c("DeleteRegion","AdjustableTrim","Deviation"))) {
+    advOptions <- paste0(advOptions, "Delete corrections excluded.")
   } 
 
   return(advOptions)

diff --git a/inst/correctionsataglance/correctionsataglance.Rmd b/inst/correctionsataglance/correctionsataglance.Rmd
@@ -35,7 +35,7 @@ cat(getLogo())
 </div>
 </div>
 
-`r if(!isEmptyOrBlank(fetchReportMetadataField(data, 'excludeCorrections'))){ paste("**Advanced Options: ** Delete corrections excluded.") }`
+`r if(!isEmptyOrBlank(fetchRequestParametersField(data, 'excludedCorrections'))){ paste("**Advanced Options: ** Delete corrections excluded.") }`
 
 ***
 

diff --git a/inst/extdata/correctionsataglance/correctionsataglance-example7.json b/inst/extdata/correctionsataglance/correctionsataglance-example7.json
@@ -340,7 +340,7 @@
     "county": "Clark County",
     "description": "Shows overview of correction information",
     "title": "Corrections At a Glance",
-    "excludeCorrections": "",
+    "excludedCorrections": "",
     "primaryParameter": "Discharge.ft^3/s@094196781",
     "primaryTsIdentifier": "b74def186df84afe9b6ca78d3db7f464",
     "requestId": "CorrectionsAtAGlanceChoreographer-673c946f-2986-46f7-aaa7-72f92cf0574f",

diff --git a/inst/extdata/testsnippets/test-utils-plot.json b/inst/extdata/testsnippets/test-utils-plot.json
@@ -13492,7 +13492,7 @@
             "ratingModelIdentifier": "Gage height-Discharge.STGQ@01010000",
             "firstStatDerivedIdentifier": "d859d139b2c54cffa2fb6ee358340654",
             "thirdStatDerivedIdentifier": "",
-			"excludeCorrections": "",
+			"excludedCorrections": "",
 			"excludeZeroNegative": false,
 			"excludeDiscrete": false,
 			"gradeMetadata": {

diff --git a/tests/testthat/test-timeseriessummary.R b/tests/testthat/test-timeseriessummary.R
@@ -2921,7 +2921,9 @@ test_that('formatAdvReportOptions function returns expected info to display on T
                                "county": "Aroostook County",
                                "description": "Shows relevant information about a timeseries",
                                "title": "Time Series Summary",
-                               "excludeCorrections": "DeleteRegion,",
+                               "requestParameters": {
+                                  "excludedCorrections": [ "DeleteRegion", "AdjustableTrim", "Deviation" ]
+                               },
                                "primaryParameter": "Discharge.ft^3/s@01011000",
                                "primaryTsIdentifier": "abd7a6b631874668b953e88cbbf4e374",
                                "requestId": "TimeSeriesSummaryChoreographer-cea278ed-392f-4db1-9c58-ba11ea5eeb96",
@@ -2940,8 +2942,8 @@ test_that('formatAdvReportOptions function returns expected info to display on T
                                "startDate": "2016-08-01T00:00:00Z"
 }
 }')
-  advOptions <- repgen:::formatAdvReportOptions(repgen:::fetchReportMetadataField(advOptionsJson,'excludeCorrections'))
-  expect_equal(advOptions, "Delete region corrections excluded.")
+  advOptions <- repgen:::formatAdvReportOptions(repgen:::fetchRequestParametersField(advOptionsJson,'excludedCorrections'))
+  expect_equal(advOptions, "Delete corrections excluded.")
 })
 
 setwd(dir = wd)