fixed the zipfile download issue

USEPA · Jan 9, 2024 · ed85f5e · ed85f5e
1 parent b6b0844
commit ed85f5e
Show file tree

Hide file tree

Showing 4 changed files with 14,612 additions and 22 deletions.
diff --git a/R/mod_query_data.R b/R/mod_query_data.R
@@ -61,7 +61,7 @@ mod_query_data_ui <- function(id) {
     shiny::fluidRow(column(
       4,
       shiny::dateInput(
-        ns("startdate"),
+        ns("startDate"),
         "Start Date",
         format = "yyyy-mm-dd",
         startview = "year"
@@ -70,7 +70,7 @@ mod_query_data_ui <- function(id) {
     column(
       4,
       shiny::dateInput(
-        ns("enddate"),
+        ns("endDate"),
         "End Date",
         format = "yyyy-mm-dd",
         startview = "year"
@@ -111,7 +111,7 @@ mod_query_data_ui <- function(id) {
       column(
         4,
         shiny::selectizeInput(
-          ns("proj"),
+          ns("project"),
           "Project(s)",
           choices = NULL,
           multiple = TRUE
@@ -277,7 +277,7 @@ mod_query_data_server <- function(id, tadat) {
                                 choices = c(chars),
                                 server = TRUE)
     shiny::updateSelectizeInput(session,
-                                "proj",
+                                "project",
                                 choices = c(projects),
                                 server = TRUE)
     shiny::updateSelectizeInput(
@@ -346,10 +346,10 @@ mod_query_data_server <- function(id, tadat) {
       } else {
         tadat$sampleMedia <- input$media
       }
-      if (is.null(input$proj)) {
+      if (is.null(input$project)) {
         tadat$project <- "null"
       } else {
-        tadat$project <- input$proj
+        tadat$project <- input$project
       }
       if (is.null(input$org)) {
         tadat$organization <- "null"
@@ -362,17 +362,17 @@ mod_query_data_server <- function(id, tadat) {
         tadat$siteid <- input$siteid
         # siteid = stringr::str_trim(unlist(strsplit(input$siteids,",")))
       }
-      if (length(input$enddate) == 0) {
+      if (length(input$endDate) == 0) {
         # ensure if date is empty, the query receives a proper input ("null")
-        tadat$enddate <- "null"
+        tadat$endDate <- "null"
       } else {
-        tadat$enddate <- as.character(input$enddate)
+        tadat$endDate <- as.character(input$endDate)
       }
-      if (length(input$startdate) == 0) {
+      if (length(input$startDate) == 0) {
         # ensure if date is empty, the query receives a proper start date. Might want a warning message instead.
-        tadat$startdate <- "1800-01-01"
+        tadat$startDate <- "1800-01-01"
       } else {
-        tadat$startdate <- as.character(input$startdate)
+        tadat$startDate <- as.character(input$startDate)
       }
       # a modal that pops up showing it's working on querying the portal
       shinybusy::show_modal_spinner(
@@ -394,8 +394,8 @@ mod_query_data_server <- function(id, tadat) {
         sampleMedia = tadat$sampleMedia,
         project = tadat$project,
         organization = tadat$organization,
-        startDate = tadat$startdate,
-        endDate = tadat$enddate,
+        startDate = tadat$startDate,
+        endDate = tadat$endDate,
         applyautoclean = TRUE
       )
 
@@ -437,10 +437,10 @@ mod_query_data_server <- function(id, tadat) {
                                       selected = tadat$characteristicName)
           shiny::updateSelectizeInput(session, "chargroup", selected = tadat$characteristicType)
           shiny::updateSelectizeInput(session, "media", selected = tadat$sampleMedia)
-          shiny::updateSelectizeInput(session, "proj", selected = tadat$proj)
+          shiny::updateSelectizeInput(session, "project", selected = tadat$project)
           shiny::updateSelectizeInput(session, "org", selected = tadat$organization)
-          shiny::updateDateInput(session, "startdate", value = tadat$startDate)
-          shiny::updateDateInput(session, "enddate", value = tadat$endDate)
+          shiny::updateDateInput(session, "startDate", value = tadat$startDate)
+          shiny::updateDateInput(session, "endDate", value = tadat$endDate)
         }
       }
 

diff --git a/R/utils.R b/R/utils.R
@@ -20,7 +20,7 @@ utils::globalVariables(c(
   "Field", "characteristicName", "characteristicType",
   "countycode", "endDate", "example_data", "huc", "m2f",
   "nd_method", "nd_mult", "od_method", "org_table",
-  "organization", "original_source", "proj", "sampleMedia",
+  "organization", "original_source", "project", "sampleMedia",
   "selected_filters", "selected_flags", "siteType",
   "siteid", "startDate", "statecode"
 ))
diff --git a/R/utils_track_progress.R b/R/utils_track_progress.R
@@ -11,7 +11,7 @@ writeFile <- function(tadat, filename) {
   characteristicName = tadat$characteristicName
   characteristicType = tadat$characteristicType
   sampleMedia = tadat$sampleMedia
-  proj = tadat$proj
+  project = tadat$project
   organization = tadat$organization
   startDate = tadat$startDate
   endDate = tadat$endDate
@@ -36,7 +36,7 @@ writeFile <- function(tadat, filename) {
     characteristicName,
     characteristicType,
     sampleMedia,
-    proj,
+    project,
     organization,
     startDate,
     endDate,
@@ -88,7 +88,7 @@ readFile <- function(tadat, filename) {
   tadat$characteristicName = characteristicName
   tadat$characteristicType = characteristicType
   tadat$sampleMedia = sampleMedia
-  tadat$proj = proj
+  tadat$project = project
   tadat$organization = organization
   tadat$startDate = startDate
   tadat$endDate = endDate
@@ -109,6 +109,8 @@ invalidFile <- function(trigger) {
 
 
 writeNarrativeDataFrame <- function(tadat) {
+  # sampleMedia needs to be a single string for this part
+  tadat$sampleMedia = paste(tadat$sampleMedia, 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)
@@ -141,7 +143,7 @@ writeNarrativeDataFrame <- function(tadat) {
         tadat$characteristicName,
         tadat$characteristicType,
         tadat$sampleMedia,
-        tadat$proj,
+        tadat$project,
         tadat$organization,
         tadat$startDate,
         tadat$endDate