Skip to content

Commit

Permalink
small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cristinamullin committed Nov 22, 2023
1 parent d27ee7f commit f71cb5b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion R/app_server.R
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ app_server <- function(input, output, session) {
shiny::observeEvent(tadat$new, {
shiny::showModal(shiny::modalDialog(
title = "Data Loaded",
"Your data were successfully loaded into the app and are displayed on the Overview tab. The following data wrangling and cleaning steps were performed automatically when data was loaded: 1) created TADA versions of columns in dataset for editing (original columns are retained for transparency), 2) removed exact duplicates, 3) addressed special characters, 4) identified detection limit data, 5) copied detection limit value to result value if result value was blank, 6) harmonized result and depth units to TADA defaults, and 7) replaced retired characteristic names with new names. See summary information about your dataset in the gray box at the bottom of the app."
"Your data were successfully loaded into the app and are displayed on the Overview tab. The following data wrangling steps were performed automatically when data was loaded: 1) created TADA versions of a subset of columns for editing (originals are retained), 2) removed exact duplicates, 3) handled/flagged special characters and text in result values and units, 4) identified detection limit data and copied limit value to result value if blank, 5) harmonized result and depth units to TADA defaults, and 6) replaced retired characteristic names with current names. See summary information about your dataset in the gray box at the bottom of the app."
))
shiny::updateTabsetPanel(session = session, inputId = "tabbar", selected = "Overview")
tadat$new <- NULL
Expand Down
4 changes: 2 additions & 2 deletions R/mod_TADA_summary.R
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,11 @@ mod_TADA_summary_server <- function(id, tadat) {
}
})

# download dataset button - only appears if there exists data in the app already
# download dataset button - only appears if there data exists in the app already
output$dwn_all <- shiny::renderUI({
shiny::req(tadat$raw)
shiny::downloadButton(ns("download_all"),
"Download Working Dataset (.xlsx)",
"Download Working Dataset (.zip)",
style = "color: #fff; background-color: #337ab7; border-color: #2e6da4")
})

Expand Down
5 changes: 3 additions & 2 deletions R/mod_data_flagging.R
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,9 @@ mod_data_flagging_server <- function(id, tadat) {
session = shiny::getDefaultReactiveDomain()
)

# Add flagging columns to raw table
# tadat$raw <- applyFlags(tadat$raw, tadat$orgs)
# Add flagging columns to raw table, make sure line below is
# not commented out once done with testing
tadat$raw <- applyFlags(tadat$raw, tadat$orgs)
# write.csv(tadat$raw, "flagged.csv")
# tadat$raw = utils::read.csv("flagged.csv") # THIS IS TRIPS WORKING FILE FOR TESTING, COMMENT OUT WHEN COMMITTING TO DEVELOP

Expand Down

0 comments on commit f71cb5b

Please sign in to comment.