diff --git a/R/app_version.R b/R/app_version.R index 8994287..9938e10 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'Version: 25.4.1.250403_1309' +app_version <- function()'Version: 25.4.1.250403_1409' diff --git a/R/correlations-module.R b/R/correlations-module.R index fd7c282..adfd0ae 100644 --- a/R/correlations-module.R +++ b/R/correlations-module.R @@ -128,7 +128,7 @@ sentence_paste <- function(data, and.str = "and") { } else if (length(data) == 2) { paste(data, collapse = glue::glue(" {and.str} ")) } else if (length(data) > 2) { - paste(paste(data[-length(data)], collapse = ", "), data[length(data)], collapse = glue::glue(" {and.str} ")) + paste(paste(data[-length(data)], collapse = ", "), data[length(data)], sep = glue::glue(" {and.str} ")) } } diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R index 2684ed6..60e0bea 100644 --- a/inst/apps/FreesearchR/app.R +++ b/inst/apps/FreesearchR/app.R @@ -10,7 +10,7 @@ #### Current file: /Users/au301842/FreesearchR/R//app_version.R ######## -app_version <- function()'Version: 25.4.1.250403_1309' +app_version <- function()'Version: 25.4.1.250403_1409' ######## @@ -287,7 +287,7 @@ sentence_paste <- function(data, and.str = "and") { } else if (length(data) == 2) { paste(data, collapse = glue::glue(" {and.str} ")) } else if (length(data) > 2) { - paste(paste(data[-length(data)], collapse = ", "), data[length(data)], collapse = glue::glue(" {and.str} ")) + paste(paste(data[-length(data)], collapse = ", "), data[length(data)], sep = glue::glue(" {and.str} ")) } } diff --git a/inst/apps/FreesearchR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf b/inst/apps/FreesearchR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf index b93efe5..1950a32 100644 --- a/inst/apps/FreesearchR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf +++ b/inst/apps/FreesearchR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf @@ -5,6 +5,6 @@ account: agdamsbo server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 13611288 -bundleId: 10047791 +bundleId: 10049531 url: https://agdamsbo.shinyapps.io/freesearcheR/ version: 1 diff --git a/vignettes/FreesearchR.Rmd b/vignettes/FreesearchR.Rmd index 86ea6ec..9f9a343 100644 --- a/vignettes/FreesearchR.Rmd +++ b/vignettes/FreesearchR.Rmd @@ -9,6 +9,7 @@ vignette: > ```{r setup, include=FALSE} knitr::opts_chunk$set(echo = TRUE,eval = FALSE) +source(here::here("functions.R")) ``` # Getting started with ***FreesearchR*** @@ -57,7 +58,25 @@ Currently several data file formats are supported for easy import (csv, txt, xls ## Visualise -- Would be nice to have a table of possible plots, their description and data options +Below are the available plot types listed. + +```{r echo = FALSE, eval = TRUE} +c("continuous", "dichotomous", "ordinal", "categorical") |> + lapply(\(.x){ + dplyr::bind_cols( + dplyr::tibble("Data type"=.x), + supported_plots() |> + lapply(\(.y){ + if (.x %in% .y$primary.type){ + .y[c("descr","note")]|> dplyr::bind_cols() + } +})|> + dplyr::bind_rows() |> + setNames(c("Plot type","Description"))) + }) |> + dplyr::bind_rows() |> + toastui::datagrid(filters=TRUE,theme="striped") +``` ## Regression