diff --git a/DESCRIPTION b/DESCRIPTION index c4259a8e..476adb11 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,6 +27,7 @@ Suggests: plotly Imports: dplyr, + esquisse, htmlwidgets, purrr, stringr, diff --git a/NAMESPACE b/NAMESPACE index 624c3ab5..9c9fb165 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -36,14 +36,13 @@ export(settingsMapping) export(settingsMappingUI) import(clisymbols) import(dplyr) +import(esquisse) import(magrittr) import(shiny) import(tools) import(yaml) importFrom(DT,DTOutput) importFrom(DT,renderDT) -importFrom(esquisse,filterDF) -importFrom(esquisse,filterDF_UI) importFrom(haven,read_sas) importFrom(magrittr,"%>%") importFrom(purrr,keep) diff --git a/R/mod_filterTab.R b/R/mod_filterTab.R index d6d40a2e..5c316396 100644 --- a/R/mod_filterTab.R +++ b/R/mod_filterTab.R @@ -3,7 +3,7 @@ #' #' @param filterDomain data set for the domain #' -#' @importFrom esquisse filterDF_UI +#' @import esquisse #' @importFrom shiny dataTableOutput #' #' @export @@ -50,7 +50,7 @@ filterTabUI <- function(id, filterDomain = "dm"){ #' #' @return filtered data set #' -#' @importFrom esquisse filterDF +#' @import esquisse #' @importFrom shinyWidgets progressBar updateProgressBar #' @importFrom shiny renderDataTable #' @@ -71,7 +71,7 @@ filterTab <- function(input, output, session, domainData, filterDomain, id_col){ }) ) - observeEvent(res_filter$data_filtered(), { + observeEvent(res_filter$data_filtered(), { updateProgressBar( session = session, id = "pbar", value = nrow(res_filter$data_filtered()), total = nrow(raw) diff --git a/man/app_startup.Rd b/man/app_startup.Rd index eaa056cf..d6a45b9c 100644 --- a/man/app_startup.Rd +++ b/man/app_startup.Rd @@ -4,7 +4,13 @@ \alias{app_startup} \title{Startup code for shiny app} \usage{ -app_startup(domainData, meta, charts, mapping, chartSettingsPaths) +app_startup( + domainData = NULL, + meta = NULL, + charts = NULL, + mapping = NULL, + chartSettingsPaths = NULL +) } \value{ List of elements for used to initialize the shiny app with the following parameters diff --git a/man/settingsData.Rd b/man/settingsData.Rd index d2210eea..fe6554c1 100644 --- a/man/settingsData.Rd +++ b/man/settingsData.Rd @@ -13,8 +13,7 @@ settingsData(input, output, session, domains, filtered) \item{session}{Shiny session object} -\item{domains}{named list of the data.frames for each domain -#'} +\item{domains}{named list of the data.frames for each domain} } \description{ server for the display of the loaded data diff --git a/man/settingsDataUI.Rd b/man/settingsDataUI.Rd index 435571e4..1c50c9b5 100644 --- a/man/settingsDataUI.Rd +++ b/man/settingsDataUI.Rd @@ -4,7 +4,7 @@ \alias{settingsDataUI} \title{Settings Module - data details} \usage{ -settingsDataUI(id, domains) +settingsDataUI(id) } \arguments{ \item{domains}{named list of the data.frames for each domain}