Importér data fra regneark/fil på din enhed, -direkte fra en REDCap-server, afprøv med -eksempel-data eller tilgå data direkte hvis du -afvikler i R lokalt
Forbered data til analys ved at filtrere, ændre -variabler eller opret helt nye variabler
Import data from a spreadsheet/file on your +machine, directly from a REDCap server, try +it with sample data or access data directly if run in R +locally
Prepare data for analysis by filtering data, +modifying variables or create new variables
Evaluate data using descriptive analyses methods and inspect cross-correlations as well as missing observations
Visualise data by creating simple, clean plots for diff --git a/app_docker/www/intro_da.md b/app_docker/www/intro_da.md index 4a0afe5d..d7ccf59b 100644 --- a/app_docker/www/intro_da.md +++ b/app_docker/www/intro_da.md @@ -6,13 +6,11 @@ output: html_fragment Dette er ***FreesearchR***-værktøjet, et gratis værktøj til databehandling og -analyse. Har du brug for mere avancerede værktøjer, så kan du starte ***FreesearchR*** og senere selv hente *R* og *RStudio* eller lignende. -Vi arbejder hårdt på at introducere en komplet oversættelse til dansk. Hvis du har lyst til at bidrage, er du velkommen til at kontakte os på [info@freesearchr.org](mailto:info@freesearchr.org). - Herunder kan du helt kort se, hvad du kan bruge ***FreesearchR*** til: -1. **Importér data** fra regneark/fil på din enhed, direkte fra en [REDCap-server](https://projectredcap.org/ "Læs mere of REDCap-værktøjet"), afprøv med eksempel-data eller tilgå data direkte [hvis du afvikler i R lokalt](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Læs mere om at køre FreesearchR på din egen maskine") +1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine") -2. **Forbered** data til analys ved at filtrere, ændre variabler eller opret helt nye variabler +2. **Prepare** data for analysis by filtering data, modifying variables or create new variables 3. **Evaluate data** using descriptive analyses methods and inspect cross-correlations as well as [missing observations](https://agdamsbo.github.io/FreesearchR/articles/missingness.html "Read more about missing data") diff --git a/app_docker/www/intro_sw.html b/app_docker/www/intro_sw.html index 40da6fd4..39ee4dc9 100644 --- a/app_docker/www/intro_sw.html +++ b/app_docker/www/intro_sw.html @@ -3,14 +3,12 @@
Karibu 
-Hii ni FreesearchR zana ya kuchanganua -data, zana isiyolipishwa ya kutathmini na kuchanganua data msingi. Iwapo -unahitaji zana za kina zaidi, anza na -FreesearchR na basi pengine utakuwa bora -kutumia R au sawa moja kwa moja.
-Tunajitahidi kutambulisha tafsiri kamili kwa Kiswahili. Ikiwa -ungependa kuchangia, tafadhali wasiliana na info@freesearchr.org.
-Na FreesearchR unaweza:
+This is the FreesearchR data analysis tool, +a free tool for basic data evaluation and analysis. If you need more +advanced tools, start with FreesearchR and +then you’ll probably be better off using R or similar +directly.
+With this tool you can:
Import data from a spreadsheet/file on your machine, directly from a REDCap server, try diff --git a/app_docker/www/intro_sw.md b/app_docker/www/intro_sw.md index 06a8bea3..37c7f09a 100644 --- a/app_docker/www/intro_sw.md +++ b/app_docker/www/intro_sw.md @@ -4,11 +4,9 @@ output: html_fragment # Karibu
-
-Hii ni ***FreesearchR*** zana ya kuchanganua data, zana isiyolipishwa ya kutathmini na kuchanganua data msingi. Iwapo unahitaji zana za kina zaidi, anza na ***FreesearchR*** na basi pengine utakuwa bora kutumia *R* au sawa moja kwa moja.
+This is the ***FreesearchR*** data analysis tool, a free tool for basic data evaluation and analysis. If you need more advanced tools, start with ***FreesearchR*** and then you'll probably be better off using *R* or similar directly.
-Tunajitahidi kutambulisha tafsiri kamili kwa Kiswahili. Ikiwa ungependa kuchangia, tafadhali wasiliana na [info@freesearchr.org](mailto:info@freesearchr.org).
-
-Na ***FreesearchR*** unaweza:
+With this tool you can:
1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine")
diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R
index a5b7d24e..2de02a7a 100644
--- a/inst/apps/FreesearchR/app.R
+++ b/inst/apps/FreesearchR/app.R
@@ -1,7 +1,7 @@
########
-#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmprKaNhO/file2c953618a132.R
+#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpWiu9wh/file1e99785ae783.R
########
i18n_path <- system.file("translations", package = "FreesearchR")
@@ -62,7 +62,7 @@ i18n$set_translation_language("en")
#### Current file: /Users/au301842/FreesearchR/R//app_version.R
########
-app_version <- function()'25.10.2'
+app_version <- function()'25.10.1'
########
@@ -4035,7 +4035,7 @@ data_types <- function() {
#### Current file: /Users/au301842/FreesearchR/R//hosted_version.R
########
-hosted_version <- function()'v25.10.2-251007'
+hosted_version <- function()'v25.10.1-251002'
########
@@ -4567,7 +4567,7 @@ import_file_ui <- function(id,
shiny::tags$b(i18n$t("No file selected.")),
# shiny::textOutput(ns("trans_format_text")),
# This is the easiest solution, though not gramatically perfect
- i18n$t("You can choose between these file types:"), paste(file_extensions, collapse = ", "),
+ i18n$t("You can choose between these file types:"), paste(file_extensions,collapse=', '),
# sprintf("You can import %s files", paste(file_extensions, collapse = ", ")),
dismissible = TRUE
)
@@ -4600,8 +4600,7 @@ import_file_server <- function(id,
show_data_in = c("popup", "modal"),
trigger_return = c("button", "change"),
return_class = c("data.frame", "data.table", "tbl_df", "raw"),
- reset = reactive(NULL),
- limit=100000) {
+ reset = reactive(NULL)) {
read_fns <- list(
ods = "import_ods",
dta = "import_dta",
@@ -4720,10 +4719,6 @@ import_file_server <- function(id,
extra = if (isTRUE(input$preview_data)) i18n$t("First five rows are shown below:")
)
)
-
- ## As a protective measure, the dataset size is capped at cell limit
- imported <- limit_data_size(imported,limit = limit)
-
temporary_rv$status <- "success"
temporary_rv$data <- imported
temporary_rv$name <- input$file$name
@@ -4932,20 +4927,9 @@ import_dta <- function(file) {
#' @export
#'
import_rds <- function(file) {
- out <- readr::read_rds(
+ readr::read_rds(
file = file
)
-
- if (is.data.frame(out)) {
- out
- } else if (is.vector(out) && !is.null(dim(out))) {
- ## If the data is a simple vector (simple test), it is coerced to a data.frame
- as.data.frame(out)
- } else {
- ## If not a data.frame and not a vector (probably a list of elements)
- ## Flattened to ensure no nested lists
- as.data.frame(purrr::list_flatten(out)[[1]])
- }
}
#' @title Create a select input control with icon(s)
@@ -5051,42 +5035,6 @@ import_file_demo_app <- function() {
}
-#' Limit the allowed data set size by number of cells
-#'
-#' @description
-#' This function may act to guard a hosted app against very large data sets in
-#' addition to the file size limitations.
-#' The function will limit the data set by dropping rows.
-#'
-#'
-#' @param data data.frame
-#' @param limit cell number limit. Default is NULL.
-#'
-#' @returns data.frame
-#' @export
-#'
-#' @examples
-#' prod(dim(mtcars))
-#' limit_data_size(mtcars)
-#' limit_data_size(mtcars,100)
-limit_data_size <- function(data, limit = NULL) {
- ## Add security to only allow dataset of 100.000 cells
- ## Ideally this should only go for the hosted version
-
- if (is.null(limit)){
- return(data)
- }
-
- data_dim <- dim(data)
-
- if (prod(data_dim) > limit) {
- head(data, floor(limit / data_dim[2]))
- } else {
- data
- }
-}
-
-
########
#### Current file: /Users/au301842/FreesearchR/R//launch_FreesearchR.R
########
@@ -5572,8 +5520,7 @@ vertical_stacked_bars <- function(data,
t.size = 10,
l.color = "black",
l.size = .5,
- draw.lines = TRUE,
- label.str="{n}\n{round(100 * p,0)}%") {
+ draw.lines = TRUE) {
if (is.null(group)) {
df.table <- data[c(score, group, strata)] |>
dplyr::mutate("All" = 1) |>
@@ -5618,8 +5565,7 @@ vertical_stacked_bars <- function(data,
y = p_prev + 0.49 * p,
color = as.numeric(score) > contrast_cut,
# label = paste0(sprintf("%2.0f", 100 * p),"%"),
- # label = sprintf("%2.0f", 100 * p)
- label = glue::glue(label.str)
+ label = sprintf("%2.0f", 100 * p)
)
) +
ggplot2::labs(fill = score_label) +
@@ -9073,7 +9019,7 @@ ui_elements <- function(selection) {
"Yes" = "yes"
)
),
- shiny::helpText(i18n$t("Option to perform statistical comparisons between strata in baseline table."))
+ shiny::helpText("Option to perform statistical comparisons between strata in baseline table.")
),
shiny::br(),
shiny::br(),
@@ -9083,8 +9029,7 @@ ui_elements <- function(selection) {
width = "100%",
icon = shiny::icon("calculator"),
disabled = TRUE
- ),
- shiny::helpText(i18n$t("Press 'Evaluate' to create the comparison table."))
+ )
)
)
),
@@ -11416,7 +11361,7 @@ ui <- bslib::page_fixed(
## Code formatting dependencies
prismDependencies,
prismRDependency,
- # html_dependency_FreesearchR(),
+ html_dependency_FreesearchR(),
## Version dependent header
header_include(),
## This adds the actual favicon
@@ -11482,9 +11427,9 @@ server <- function(input, output, session) {
files.to.keep <- list.files("www/")
## This works in a minimal working example, but not here. Will investigate.
- # shinyjs::runjs("var language = window.navigator.userLanguage || window.navigator.language;
- # var shortLang = language.split('-')[0];
- # Shiny.onInputChange('browser_lang', shortLang);")
+# shinyjs::runjs("var language = window.navigator.userLanguage || window.navigator.language;
+# var shortLang = language.split('-')[0];
+# Shiny.onInputChange('browser_lang', shortLang);")
load_data()
@@ -11618,7 +11563,6 @@ server <- function(input, output, session) {
output$intro_text <- renderUI(includeHTML(i18n$t("www/intro.html")))
})
- ## This is not working but kept to try to solve if deemed necessary
shiny::observe(
output$footer_text_div <- renderUI({
shiny::tags$footer(
@@ -11685,9 +11629,7 @@ server <- function(input, output, session) {
id = "file_import",
show_data_in = "popup",
trigger_return = "change",
- return_class = "data.frame",
- ## Added data.frame size limit (number of cells), rows are dropped to fit
- limit = 100000
+ return_class = "data.frame"
)
shiny::observeEvent(data_file$data(), {
@@ -11735,7 +11677,7 @@ server <- function(input, output, session) {
modal_visual_summary(
id = "initial_summary",
footer = NULL,
- size = "xl", title = i18n$t("Data classes and missing observations")
+ size = "xl",title = i18n$t("Data classes and missing observations")
)
},
error = function(err) {
@@ -12333,19 +12275,6 @@ server <- function(input, output, session) {
data_description(rv$list$data, data_text = "The dataset without text variables")
})
- ## Only allow evaluation if the dataset has fewer then 50 variables
- ##
-
- # shiny::observeEvent(
- # list(
- # rv$list$data
- # ),
- # {
- # shiny::req(rv$list$data)
- #
- # })
-
-
shiny::observeEvent(
list(
input$act_eval
@@ -12360,25 +12289,9 @@ server <- function(input, output, session) {
add.overall = TRUE
)
-
- # Attempt to introduce error on analysing too large dataset
- # tryCatch(
- # {
- # if (ncol(rv$list$data) > 10) {
- # n_col <- ncol(rv$list$data)
- # # stop(glue::glue(i18n$t("The data includes {n_col} variables. Please limit to 100.")))
- # print("Please limit to 100.")
- # } else {
- shiny::withProgress(message = "Creating the table. Hold on for a moment..", {
- rv$list$table1 <- rlang::exec(create_baseline, !!!append_list(rv$list$data, parameters, "data"))
- })
- # }
- # },
- # error = function(err) {
- # showNotification(err, type = "err")
- # }
- # )
-
+ shiny::withProgress(message = "Creating the table. Hold on for a moment..", {
+ rv$list$table1 <- rlang::exec(create_baseline, !!!append_list(rv$list$data, parameters, "data"))
+ })
rv$code$table1 <- glue::glue("FreesearchR::create_baseline(df,{list2str(parameters)})")
}
diff --git a/inst/apps/FreesearchR/www/intro_da.html b/inst/apps/FreesearchR/www/intro_da.html
index e372d960..5df8d8b3 100644
--- a/inst/apps/FreesearchR/www/intro_da.html
+++ b/inst/apps/FreesearchR/www/intro_da.html
@@ -8,18 +8,15 @@
værktøj til databehandling og -analyse. Har du brug for mere avancerede
værktøjer, så kan du starte FreesearchR og
senere selv hente R og RStudio eller lignende.Vi arbejder hårdt på at introducere en komplet oversættelse til -dansk. Hvis du har lyst til at bidrage, er du velkommen til at kontakte -os på info@freesearchr.org.
Herunder kan du helt kort se, hvad du kan bruge FreesearchR til:
-
-
Importér data fra regneark/fil på din enhed, -direkte fra en REDCap-server, afprøv med -eksempel-data eller tilgå data direkte hvis du -afvikler i R lokalt
-Forbered data til analys ved at filtrere, ændre -variabler eller opret helt nye variabler
+Import data from a spreadsheet/file on your +machine, directly from a REDCap server, try +it with sample data or access data directly if run in R +locally
+Prepare data for analysis by filtering data, +modifying variables or create new variables
Evaluate data using descriptive analyses methods and inspect cross-correlations as well as missing observations
Visualise data by creating simple, clean plots for diff --git a/inst/apps/FreesearchR/www/intro_da.md b/inst/apps/FreesearchR/www/intro_da.md index 4a0afe5d..d7ccf59b 100644 --- a/inst/apps/FreesearchR/www/intro_da.md +++ b/inst/apps/FreesearchR/www/intro_da.md @@ -6,13 +6,11 @@ output: html_fragment Dette er ***FreesearchR***-værktøjet, et gratis værktøj til databehandling og -analyse. Har du brug for mere avancerede værktøjer, så kan du starte ***FreesearchR*** og senere selv hente *R* og *RStudio* eller lignende. -Vi arbejder hårdt på at introducere en komplet oversættelse til dansk. Hvis du har lyst til at bidrage, er du velkommen til at kontakte os på [info@freesearchr.org](mailto:info@freesearchr.org). - Herunder kan du helt kort se, hvad du kan bruge ***FreesearchR*** til: -1. **Importér data** fra regneark/fil på din enhed, direkte fra en [REDCap-server](https://projectredcap.org/ "Læs mere of REDCap-værktøjet"), afprøv med eksempel-data eller tilgå data direkte [hvis du afvikler i R lokalt](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Læs mere om at køre FreesearchR på din egen maskine") +1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine") -2. **Forbered** data til analys ved at filtrere, ændre variabler eller opret helt nye variabler +2. **Prepare** data for analysis by filtering data, modifying variables or create new variables 3. **Evaluate data** using descriptive analyses methods and inspect cross-correlations as well as [missing observations](https://agdamsbo.github.io/FreesearchR/articles/missingness.html "Read more about missing data") diff --git a/inst/apps/FreesearchR/www/intro_sw.html b/inst/apps/FreesearchR/www/intro_sw.html index 40da6fd4..39ee4dc9 100644 --- a/inst/apps/FreesearchR/www/intro_sw.html +++ b/inst/apps/FreesearchR/www/intro_sw.html @@ -3,14 +3,12 @@
Karibu
-Hii ni FreesearchR zana ya kuchanganua -data, zana isiyolipishwa ya kutathmini na kuchanganua data msingi. Iwapo -unahitaji zana za kina zaidi, anza na -FreesearchR na basi pengine utakuwa bora -kutumia R au sawa moja kwa moja.
-Tunajitahidi kutambulisha tafsiri kamili kwa Kiswahili. Ikiwa -ungependa kuchangia, tafadhali wasiliana na info@freesearchr.org.
-Na FreesearchR unaweza:
+This is the FreesearchR data analysis tool, +a free tool for basic data evaluation and analysis. If you need more +advanced tools, start with FreesearchR and +then you’ll probably be better off using R or similar +directly.
+With this tool you can:
Import data from a spreadsheet/file on your machine, directly from a REDCap server, try diff --git a/inst/apps/FreesearchR/www/intro_sw.md b/inst/apps/FreesearchR/www/intro_sw.md index 06a8bea3..37c7f09a 100644 --- a/inst/apps/FreesearchR/www/intro_sw.md +++ b/inst/apps/FreesearchR/www/intro_sw.md @@ -4,11 +4,9 @@ output: html_fragment # Karibu
-Hii ni ***FreesearchR*** zana ya kuchanganua data, zana isiyolipishwa ya kutathmini na kuchanganua data msingi. Iwapo unahitaji zana za kina zaidi, anza na ***FreesearchR*** na basi pengine utakuwa bora kutumia *R* au sawa moja kwa moja.
+This is the ***FreesearchR*** data analysis tool, a free tool for basic data evaluation and analysis. If you need more advanced tools, start with ***FreesearchR*** and then you'll probably be better off using *R* or similar directly.
-Tunajitahidi kutambulisha tafsiri kamili kwa Kiswahili. Ikiwa ungependa kuchangia, tafadhali wasiliana na [info@freesearchr.org](mailto:info@freesearchr.org).
-
-Na ***FreesearchR*** unaweza:
+With this tool you can:
1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine")
diff --git a/inst/translations/translation_da.csv b/inst/translations/translation_da.csv
index 2d9b39b2..13ab3733 100644
--- a/inst/translations/translation_da.csv
+++ b/inst/translations/translation_da.csv
@@ -244,6 +244,3 @@
"Select checks to plot","Select checks to plot"
"Multivariable regression model checks","Multivariable regression model checks"
"Grouped by {get_label(data,ter)}","Grouped by {get_label(data,ter)}"
-"Option to perform statistical comparisons between strata in baseline table.","Option to perform statistical comparisons between strata in baseline table."
-"Press 'Evaluate' to create the comparison table.","Press 'Evaluate' to create the comparison table."
-"The data includes {n_col} variables. Please limit to 100.","The data includes {n_col} variables. Please limit to 100."
diff --git a/inst/translations/translation_sw.csv b/inst/translations/translation_sw.csv
index aa1a4716..42613fca 100644
--- a/inst/translations/translation_sw.csv
+++ b/inst/translations/translation_sw.csv
@@ -244,6 +244,3 @@
"Select checks to plot","Select checks to plot"
"Multivariable regression model checks","Multivariable regression model checks"
"Grouped by {get_label(data,ter)}","Grouped by {get_label(data,ter)}"
-"Option to perform statistical comparisons between strata in baseline table.","Option to perform statistical comparisons between strata in baseline table."
-"Press 'Evaluate' to create the comparison table.","Press 'Evaluate' to create the comparison table."
-"The data includes {n_col} variables. Please limit to 100.","The data includes {n_col} variables. Please limit to 100."
diff --git a/man/import-file.Rd b/man/import-file.Rd
index 0f092d52..233800e2 100644
--- a/man/import-file.Rd
+++ b/man/import-file.Rd
@@ -21,8 +21,7 @@ import_file_server(
show_data_in = c("popup", "modal"),
trigger_return = c("button", "change"),
return_class = c("data.frame", "data.table", "tbl_df", "raw"),
- reset = reactive(NULL),
- limit = 1e+05
+ reset = reactive(NULL)
)
}
\arguments{
diff --git a/man/limit_data_size.Rd b/man/limit_data_size.Rd
deleted file mode 100644
index f6780e8c..00000000
--- a/man/limit_data_size.Rd
+++ /dev/null
@@ -1,26 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/import-file-ext.R
-\name{limit_data_size}
-\alias{limit_data_size}
-\title{Limit the allowed data set size by number of cells}
-\usage{
-limit_data_size(data, limit = NULL)
-}
-\arguments{
-\item{data}{data.frame}
-
-\item{limit}{cell number limit. Default is NULL.}
-}
-\value{
-data.frame
-}
-\description{
-This function may act to guard a hosted app against very large data sets in
-addition to the file size limitations.
-The function will limit the data set by dropping rows.
-}
-\examples{
-prod(dim(mtcars))
-limit_data_size(mtcars)
-limit_data_size(mtcars,100)
-}
diff --git a/man/vertical_stacked_bars.Rd b/man/vertical_stacked_bars.Rd
index 52f3c5c0..af09a99b 100644
--- a/man/vertical_stacked_bars.Rd
+++ b/man/vertical_stacked_bars.Rd
@@ -12,8 +12,7 @@ vertical_stacked_bars(
t.size = 10,
l.color = "black",
l.size = 0.5,
- draw.lines = TRUE,
- label.str = "{n}\\n{round(100 * p,0)}\%"
+ draw.lines = TRUE
)
}
\arguments{
diff --git a/renv.lock b/renv.lock
index 548bff24..49bb63e6 100644
--- a/renv.lock
+++ b/renv.lock
@@ -1201,8 +1201,7 @@
"License": "Unlimited",
"NeedsCompilation": "no",
"Author": "Angelo Canty [aut] (author of original code for S), Brian Ripley [aut, trl] (conversion to R, maintainer 1999--2022, author of parallel support), Alessandra R. Brazzale [ctb, cre] (minor bug fixes)",
- "Repository": "RSPM",
- "Encoding": "UTF-8"
+ "Repository": "CRAN"
},
"brio": {
"Package": "brio",