From d0029c96dd96115e80885fc9fdf2be057a863cc5 Mon Sep 17 00:00:00 2001 From: cristinamullin <46969696+cristinamullin@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:42:49 -0400 Subject: [PATCH 1/4] deploy to posit connect --- DESCRIPTION | 5 +++-- R/mod_review_data.R | 2 +- .../Cristina/tadashiny.dcf | 2 +- .../Cristina/tadashiny2.dcf | 12 ++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf diff --git a/DESCRIPTION b/DESCRIPTION index 5a1d780fd..2064f97a4 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_review_data.R b/R/mod_review_data.R index 143126400..487eb1c9d 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 7947e8931..c45baae38 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: 2943 url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/da3ffe2f-b443-4051-a029-3adb491434cb/ version: 1 asMultiple: FALSE diff --git a/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf b/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf new file mode 100644 index 000000000..48a1b67fd --- /dev/null +++ b/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf @@ -0,0 +1,12 @@ +name: tadashiny2 +title: TADAShiny +username: Cristina +account: Cristina +server: rstudio-connect.dmap-stage.aws.epa.gov +hostUrl: https://rstudio-connect.dmap-stage.aws.epa.gov/__api__ +appId: 486 +bundleId: 2941 +url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/488943de-9fbf-40a0-9054-7f37cec1b8c8/ +version: 1 +asMultiple: FALSE +asStatic: FALSE From 1c0405c41cb5b3064e4374282c06c183548004f2 Mon Sep 17 00:00:00 2001 From: cristinamullin <46969696+cristinamullin@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:09:38 -0400 Subject: [PATCH 2/4] address nutrient aggregation link bug --- R/mod_harmonize_np.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/mod_harmonize_np.R b/R/mod_harmonize_np.R index 03e35de94..ca57f22fd 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"))) From 61dcee578997c71bf4afe36a759d86a61fb20496 Mon Sep 17 00:00:00 2001 From: cristinamullin <46969696+cristinamullin@users.noreply.github.com> Date: Fri, 14 Jun 2024 13:58:23 -0400 Subject: [PATCH 3/4] deploy --- .../Cristina/tadashiny.dcf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c45baae38..9b870791b 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: 2943 +bundleId: 2961 url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/da3ffe2f-b443-4051-a029-3adb491434cb/ version: 1 asMultiple: FALSE From 22ebef9ab6c6c8a5bd0aaf190f1ffef92d286a51 Mon Sep 17 00:00:00 2001 From: cristinamullin <46969696+cristinamullin@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:04:10 -0400 Subject: [PATCH 4/4] update deployment --- .../Cristina/tadashiny.dcf | 2 +- .../Cristina/tadashiny2.dcf | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf 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 9b870791b..cf5dfea88 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: 2961 +bundleId: 2963 url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/da3ffe2f-b443-4051-a029-3adb491434cb/ version: 1 asMultiple: FALSE diff --git a/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf b/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf deleted file mode 100644 index 48a1b67fd..000000000 --- a/rsconnect/rstudio-connect.dmap-stage.aws.epa.gov/Cristina/tadashiny2.dcf +++ /dev/null @@ -1,12 +0,0 @@ -name: tadashiny2 -title: TADAShiny -username: Cristina -account: Cristina -server: rstudio-connect.dmap-stage.aws.epa.gov -hostUrl: https://rstudio-connect.dmap-stage.aws.epa.gov/__api__ -appId: 486 -bundleId: 2941 -url: https://rstudio-connect.dmap-stage.aws.epa.gov/content/488943de-9fbf-40a0-9054-7f37cec1b8c8/ -version: 1 -asMultiple: FALSE -asStatic: FALSE