diff --git a/DESCRIPTION b/DESCRIPTION index 5a1d780f..2064f97a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -42,7 +42,9 @@ Imports: RColorBrewer, grDevices, lubridate, - plotly + plotly, + shinyjs, + lwgeom Remotes: github::USEPA/EPATADA Suggests: @@ -54,7 +56,6 @@ Suggests: knitr, spelling, sf, - shinyjs, stringr, utils Depends: diff --git a/R/mod_harmonize_np.R b/R/mod_harmonize_np.R index 03e35de9..ca57f22f 100644 --- a/R/mod_harmonize_np.R +++ b/R/mod_harmonize_np.R @@ -25,7 +25,7 @@ mod_harmonize_np_ui <- function(id) { shiny::fluidRow(column(4, shiny::fileInput(ns("harm_file"), "Upload Custom Table (.csv only)"))), htmltools::br(), htmltools::h3("2. Total Nitrogen and Phosphorus Summation"), - htmltools::p("Data generators commonly analyze for several nutrient subspecies that, when added together, can be used to estimate a total nitrogen or phosphorus value. TADA uses the logic provided in ECHO's ", htmltools::a("Nurient Aggregation", href = "https://echo.epa.gov/trends/loading-tool/resources/nutrient-aggregation"), " page to rank and sum subspecies for a given day, location, depth, activity media subdivision, and unit. Total Nitrogen and Total Phosphorus values are added as new results in the dataset. Users may view the nutrient aggregation reference sheet by clicking 'See Summation Reference'. Once data are harmonized, the user may then summarize total N and P.", htmltools::strong("NOTE: "), "When two or more measurements of the same substance occur on the same day at the same location, the function uses the maximum of the group of values to calculate a total nutrient value."), + htmltools::p("Data generators commonly monitor for several nutrient subspecies that, when added together, can be used to estimate a total nitrogen or phosphorus value. TADA uses the logic provided in ECHO's Nurient Aggregation page (see: https://echo.epa.gov/trends/loading-tool/resources/nutrient-aggregation) to rank and sum subspecies for a given day, location, depth, activity media subdivision, and unit. Total Nitrogen and Total Phosphorus values are added as new results in the dataset. Users may view the nutrient aggregation reference sheet by clicking 'See Summation Reference'. Once data are harmonized, the user may then summarize total N and P.", htmltools::strong("NOTE: "), "When two or more measurements of the same substance occur on the same day at the same location, the function uses the maximum of the group of values to calculate a total nutrient value."), shiny::fluidRow( column(3, htmltools::div(style = "margin-top:20px"), shiny::downloadButton(ns("sum_dwn"), "See Summation Reference (.csv)", style = "color: #fff; background-color: #337ab7; border-color: #2e6da4")), column(3, htmltools::div(style = "margin-top:20px"), shiny::uiOutput(ns("sum_apply"))) diff --git a/R/mod_review_data.R b/R/mod_review_data.R index 14312640..487eb1c9 100644 --- a/R/mod_review_data.R +++ b/R/mod_review_data.R @@ -12,7 +12,7 @@ mod_review_data_ui <- function(id) { tagList( htmltools::h3("Removal Review"), htmltools::HTML( - "Use this tab to review flagging and filter decisions and explore the filtered dataset (still under development). Click the button below to begin." + "Use this tab to review flagging and filter decisions and explore the filtered dataset. Click the button below to begin." ), shiny::fluidRow(column( 4, diff --git a/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny.dcf b/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny.dcf index 7947e893..cf5dfea8 100644 --- a/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny.dcf +++ b/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny.dcf @@ -5,7 +5,7 @@ account: Cristina server: rstudio-connect.dmap-stage.aws.epa.gov hostUrl: https://rstudio-connect.dmap-stage.aws.epa.gov/__api__ appId: 403 -bundleId: 2745 +bundleId: 2963 url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/da3ffe2f-b443-4051-a029-3adb491434cb/ version: 1 asMultiple: FALSE