diff --git a/CITATION.cff b/CITATION.cff index fcab7f68..41ce08b6 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "FreesearchR" in publications use:' type: software license: AGPL-3.0-or-later title: 'FreesearchR: Easy data analysis for clinicians' -version: 25.11.1 +version: 25.12.1 doi: 10.5281/zenodo.14527429 identifiers: - type: url @@ -1063,6 +1063,40 @@ references: orcid: https://orcid.org/0000-0002-7559-1154 year: '2025' doi: 10.32614/CRAN.package.stRoke +- type: software + title: data.table + abstract: 'data.table: Extension of `data.frame`' + notes: Imports + url: https://r-datatable.com + repository: https://CRAN.R-project.org/package=data.table + authors: + - family-names: Barrett + given-names: Tyson + email: t.barrett88@gmail.com + orcid: https://orcid.org/0000-0002-2137-1391 + - family-names: Dowle + given-names: Matt + email: mattjdowle@gmail.com + - family-names: Srinivasan + given-names: Arun + email: asrini@pm.me + - family-names: Gorecki + given-names: Jan + - family-names: Chirico + given-names: Michael + orcid: https://orcid.org/0000-0003-0787-087X + - family-names: Hocking + given-names: Toby + orcid: https://orcid.org/0000-0002-3146-0865 + - family-names: Schwendinger + given-names: Benjamin + orcid: https://orcid.org/0000-0003-3315-8114 + - family-names: Krylov + given-names: Ivan + email: ikrylov@disroot.org + orcid: https://orcid.org/0000-0002-0172-3812 + year: '2025' + doi: 10.32614/CRAN.package.data.table - type: software title: styler abstract: 'styler: Non-Invasive Pretty Printing of R Code' diff --git a/DESCRIPTION b/DESCRIPTION index 7301de4b..035421e6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: FreesearchR Title: Easy data analysis for clinicians -Version: 25.11.2 +Version: 25.12.1 Authors@R: c( person("Andreas Gammelgaard", "Damsbo",email="agdamsbo@clin.au.dk", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7559-1154")), diff --git a/NAMESPACE b/NAMESPACE index 127b112c..1365c2d0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -51,6 +51,7 @@ export(default_parsing) export(detect_delimiter) export(drop_empty_event) export(expression_string) +export(factor_new_levels_labels) export(factorize) export(file_export) export(format_writer) @@ -148,6 +149,7 @@ export(symmetrical_scale_x_log10) export(tbl_merge) export(type_icons) export(ui_elements) +export(unique_names) export(unique_short) export(update_factor_server) export(update_factor_ui) diff --git a/NEWS.md b/NEWS.md index 6a4a4600..9e59a927 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# FreesearchR 25.12.1 + +*NEW* Option to edit factor label names in the "New factor" pop-up. This allows for easier naming for tables, but also to combine levels. A new variable is appended to the dataset if label names are changed. Code is now also exported. + +*FIX* Fixes a bug, where white space in code exported was removed. Now a little too many spaces are included. Fine tuning continues. + +*NEW* Easily copy code by just clicking "copy" in code blocks. + # FreesearchR 25.11.2 *NEW* Vignettes were moved to the [FreesearchR project knowledge base](https://freesearchr.github.io/FreesearchR-knowledge/). This was mainly to ease rendering and allow quick and easy updates as well as future translations. diff --git a/R/app_version.R b/R/app_version.R index 54c6cdf0..c86ba1bf 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'25.11.2' +app_version <- function()'25.12.1' diff --git a/R/cut-variable-ext.R b/R/cut-variable-ext.R index c1879b7c..cb27543c 100644 --- a/R/cut-variable-ext.R +++ b/R/cut-variable-ext.R @@ -374,7 +374,11 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { } ) - data <- append_column(data, column = new_variable, name = paste0(variable, "_cut"), index = "right") + data <- append_column(data, + column = new_variable, + name = unique_names(paste0(variable, "_cut"), + existing = names(data)), + index = "right") code <- rlang::call2( "append_column", diff --git a/R/hosted_version.R b/R/hosted_version.R index b477b7ff..920e146f 100644 --- a/R/hosted_version.R +++ b/R/hosted_version.R @@ -1 +1 @@ -hosted_version <- function()'v25.11.2-251119' +hosted_version <- function()'v25.12.1-251202' diff --git a/R/sysdata.rda b/R/sysdata.rda index d644c198..d5263737 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/SESSION.md b/SESSION.md index 80527531..41b64837 100644 --- a/SESSION.md +++ b/SESSION.md @@ -1,21 +1,21 @@ -------------------------------------------------------------------------------- -------------------------------- R environment --------------------------------- -------------------------------------------------------------------------------- -|setting |value | -|:-----------|:------------------------------------------| -|version |R version 4.4.1 (2024-06-14) | -|os |macOS 15.7.1 | -|system |aarch64, darwin20 | -|ui |RStudio | -|language |(EN) | -|collate |en_US.UTF-8 | -|ctype |en_US.UTF-8 | -|tz |Europe/Copenhagen | -|date |2025-11-09 | -|rstudio |2025.05.0+496 Mariposa Orchid (desktop) | -|pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) | -|quarto |1.7.30 @ /usr/local/bin/quarto | -|FreesearchR |25.11.1.251109 | +|setting |value | +|:-----------|:----------------------------------------------| +|version |R version 4.4.1 (2024-06-14) | +|os |macOS 26.1 | +|system |aarch64, darwin20 | +|ui |RStudio | +|language |(EN) | +|collate |en_US.UTF-8 | +|ctype |en_US.UTF-8 | +|tz |Europe/Copenhagen | +|date |2025-12-02 | +|rstudio |2025.09.2+418 Cucumberleaf Sunflower (desktop) | +|pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) | +|quarto |1.7.30 @ /usr/local/bin/quarto | +|FreesearchR |25.12.1.251202 | -------------------------------------------------------------------------------- @@ -83,7 +83,7 @@ |foreach |1.5.2 |2022-02-02 |CRAN (R 4.4.0) | |foreign |0.8-90 |2025-03-31 |CRAN (R 4.4.1) | |Formula |1.2-5 |2023-02-24 |CRAN (R 4.4.1) | -|FreesearchR |25.11.1 |NA |NA | +|FreesearchR |25.12.1 |NA |NA | |fs |1.6.6 |2025-04-12 |CRAN (R 4.4.1) | |gdtools |0.4.2 |2025-03-27 |CRAN (R 4.4.1) | |generics |0.1.4 |2025-05-09 |CRAN (R 4.4.1) | @@ -117,11 +117,9 @@ |later |1.4.2 |2025-04-08 |RSPM (R 4.4.0) | |lattice |0.22-7 |2025-04-02 |CRAN (R 4.4.1) | |lifecycle |1.0.4 |2023-11-07 |CRAN (R 4.4.1) | -|litedown |0.7 |2025-04-08 |CRAN (R 4.4.1) | |lme4 |1.1-37 |2025-03-26 |CRAN (R 4.4.1) | |lubridate |1.9.4 |2024-12-08 |CRAN (R 4.4.1) | |magrittr |2.0.3 |2022-03-30 |RSPM (R 4.4.0) | -|markdown |2.0 |2025-03-23 |CRAN (R 4.4.1) | |MASS |7.3-65 |2025-02-28 |CRAN (R 4.4.1) | |Matrix |1.7-3 |2025-03-11 |RSPM (R 4.4.0) | |memoise |2.0.1 |2021-11-26 |CRAN (R 4.4.0) |