Merge branch 'develop' into Manage-input-on-Censor-tab-#158

USEPA · Dec 5, 2024 · 7c485d9 · 7c485d9
2 parents 73a85df + 9ff8e9f
commit 7c485d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/R/mod_query_data.R b/R/mod_query_data.R
@@ -189,10 +189,9 @@ mod_query_data_ui <- function(id) {
     shiny::fluidRow(
       column(
              4,
-             shiny::checkboxGroupInput(ns("providers"), 
+             shiny::radioButtons(ns("providers"), 
              "Data Source", 
-             c("NWIS (USGS)" = "NWIS", "WQX (EPA)" = "STORET"), 
-             selected = c("NWIS", "STORET"))
+             c("NWIS (USGS)" = "NWIS", "WQX (EPA)" = "STORET", "Both (NWIS and WQX)" = "all"), selected = "all")
       )
     ),
     shiny::fluidRow(column(
@@ -410,7 +409,7 @@ mod_query_data_server <- function(id, tadat) {
       } else {
         tadat$countrycode <- input$countryocean
       }
-      if (is.null(input$providers)) {
+      if (is.null(input$providers) | input$providers == "all") {
         tadat$providers <- "null"
       } else {
         tadat$providers <- input$providers

diff --git a/R/utils_track_progress.R b/R/utils_track_progress.R
@@ -106,10 +106,12 @@ invalidFile <- function(trigger) {
 
 
 writeNarrativeDataFrame <- function(tadat) {
-  # sampleMedia and siteType need to be a single string for this part
+  # sampleMedia, siteType, characteristicName, and characteristicType need to be a single string for this part
   # Others? Automatic check?
   tadat$sampleMedia <- paste(tadat$sampleMedia, collapse = " ")
   tadat$siteType <- paste(tadat$siteType, collapse = " ")
+  tadat$characteristicType <- paste(tadat$characteristicType, collapse = " ")
+  tadat$characteristicName <- paste(tadat$characteristicName, collapse = " ")
   df <- data.frame(Parameter = character(), Value = character())
   df[nrow(df) + 1, ] <- c("TADA Shiny Job ID", tadat$job_id)
   df[nrow(df) + 1, ] <- c("Original data source: ", tadat$original_source)