diff --git a/CITATION.cff b/CITATION.cff index c781a622..265698dc 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.10.4 +version: 25.10.5 doi: 10.5281/zenodo.14527429 identifiers: - type: url diff --git a/DESCRIPTION b/DESCRIPTION index b90d1fef..1c3b44e8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: FreesearchR Title: Easy data analysis for clinicians -Version: 25.10.4 +Version: 25.10.5 Authors@R: c( person("Andreas Gammelgaard", "Damsbo",email="agdamsbo@clin.au.dk", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7559-1154")), @@ -125,6 +125,7 @@ Collate: 'regression_plot.R' 'regression_table.R' 'report.R' + 'separate_string.R' 'syntax_highlight.R' 'theme.R' 'translate.R' diff --git a/NAMESPACE b/NAMESPACE index a0dca89e..1544994a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -48,6 +48,7 @@ export(data_visuals_server) export(data_visuals_ui) export(default_format_arguments) export(default_parsing) +export(detect_delimiter) export(drop_empty_event) export(expression_string) export(factorize) @@ -78,6 +79,7 @@ export(is_any_class) export(is_consecutive) export(is_datetime) export(is_identical_to_previous) +export(is_splittable) export(is_valid_redcap_url) export(is_valid_token) export(launch_FreesearchR) @@ -129,6 +131,7 @@ export(remove_nested_list) export(repeated_instruments) export(sankey_ready) export(selectInputIcon) +export(separate_string) export(set_column_label) export(show_data) export(simple_snake) diff --git a/NEWS.md b/NEWS.md index f906f159..5658b0c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# FreesearchR 25.10.5 + +*NEW* New character/text split function available. A selection of delimiters are recognised and selectable. Function only available if splittable variables are present. This was the last big function to implement after workshops at Jitimai in Zanzibar. + # FreesearchR 25.10.4 *NEW* Two new options to create new simplified factors from factors. The "top" option will keep only the top N levels, while the "bottom" option will combine all levels occurring below set percentage. diff --git a/R/app_version.R b/R/app_version.R index 7ce777f9..d67b66a1 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'25.10.4' +app_version <- function()'25.10.5' diff --git a/R/create-column-mod.R b/R/create-column-mod.R index 9627b3ac..308e2c00 100644 --- a/R/create-column-mod.R +++ b/R/create-column-mod.R @@ -29,35 +29,6 @@ create_column_ui <- function(id) { shiny::tags$head( shiny::tags$link(rel = "stylesheet", type = "text/css", href = "FreesearchR/inst/assets/css/FreesearchR.css") ), - # tags$head( - # # Note the wrapping of the string in HTML() - # tags$style(HTML(" - # /* modified from esquisse for data types */ - # .btn-column-categorical { - # background-color: #EF562D; - # color: #FFFFFF; - # } - # .btn-column-continuous { - # background-color: #0C4C8A; - # color: #FFFFFF; - # } - # .btn-column-dichotomous { - # background-color: #97D5E0; - # color: #FFFFFF; - # } - # .btn-column-datetime { - # background-color: #97D5E0; - # color: #FFFFFF; - # } - # .btn-column-id { - # background-color: #848484; - # color: #FFFFFF; - # } - # .btn-column-text { - # background-color: #2E2E2E; - # color: #FFFFFF; - # }")) - # ), fluidRow( column( width = 6, diff --git a/R/hosted_version.R b/R/hosted_version.R index 9afbad44..b917069a 100644 --- a/R/hosted_version.R +++ b/R/hosted_version.R @@ -1 +1 @@ -hosted_version <- function()'v25.10.4-251027' +hosted_version <- function()'v25.10.5-251030' diff --git a/R/sysdata.rda b/R/sysdata.rda index 9c68c58f..98908065 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/SESSION.md b/SESSION.md index 90959c65..b47ad19b 100644 --- a/SESSION.md +++ b/SESSION.md @@ -10,12 +10,12 @@ |language |(EN) | |collate |en_US.UTF-8 | |ctype |en_US.UTF-8 | -|tz |Africa/Dar_es_Salaam | -|date |2025-10-27 | +|tz |Europe/Copenhagen | +|date |2025-10-30 | |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.10.4.251027 | +|FreesearchR |25.10.5.251030 | -------------------------------------------------------------------------------- @@ -44,7 +44,6 @@ |cardx |0.2.5 |2025-07-03 |CRAN (R 4.4.1) | |caTools |1.18.3 |2024-09-04 |CRAN (R 4.4.1) | |cellranger |1.1.0 |2016-07-27 |CRAN (R 4.4.0) | -|cffr |1.2.0 |2025-01-25 |CRAN (R 4.4.1) | |checkmate |2.3.2 |2024-07-29 |RSPM (R 4.4.0) | |class |7.3-23 |2025-01-01 |CRAN (R 4.4.1) | |classInt |0.4-11 |2025-01-08 |CRAN (R 4.4.1) | @@ -54,7 +53,7 @@ |colorspace |2.1-1 |2024-07-26 |CRAN (R 4.4.1) | |commonmark |2.0.0 |2025-07-07 |CRAN (R 4.4.1) | |crayon |1.5.3 |2024-06-20 |CRAN (R 4.4.1) | -|curl |6.4.0 |2025-06-22 |RSPM (R 4.4.0) | +|crosstalk |1.2.1 |2023-11-23 |CRAN (R 4.4.0) | |data.table |1.17.8 |2025-07-10 |CRAN (R 4.4.1) | |datamods |1.5.3 |2024-10-02 |CRAN (R 4.4.1) | |datawizard |1.2.0 |2025-07-17 |CRAN (R 4.4.1) | @@ -85,7 +84,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.10.4 |NA |NA | +|FreesearchR |25.10.5 |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) | @@ -113,19 +112,15 @@ |iterators |1.0.14 |2022-02-05 |CRAN (R 4.4.1) | |jquerylib |0.1.4 |2021-04-26 |CRAN (R 4.4.0) | |jsonlite |2.0.0 |2025-03-27 |CRAN (R 4.4.1) | -|jsonvalidate |1.5.0 |2025-02-07 |CRAN (R 4.4.1) | |KernSmooth |2.23-26 |2025-01-01 |CRAN (R 4.4.1) | |keyring |1.4.1 |2025-06-15 |CRAN (R 4.4.1) | |knitr |1.50 |2025-03-16 |CRAN (R 4.4.1) | -|labeling |0.4.3 |2023-08-29 |CRAN (R 4.4.1) | |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) | @@ -169,7 +164,6 @@ |R6 |2.6.1 |2025-02-15 |CRAN (R 4.4.1) | |ragg |1.4.0 |2025-04-10 |RSPM (R 4.4.0) | |rankinPlot |1.1.0 |2023-01-30 |CRAN (R 4.4.0) | -|rappdirs |0.3.3 |2021-01-31 |CRAN (R 4.4.1) | |rbibutils |2.3 |2024-10-04 |CRAN (R 4.4.1) | |RColorBrewer |1.1-3 |2022-04-03 |CRAN (R 4.4.1) | |Rcpp |1.1.0 |2025-07-02 |CRAN (R 4.4.1) | @@ -225,7 +219,6 @@ |usethis |3.1.0 |2024-11-26 |RSPM (R 4.4.0) | |utf8 |1.2.6 |2025-06-08 |CRAN (R 4.4.1) | |uuid |1.2-1 |2024-07-29 |CRAN (R 4.4.1) | -|V8 |6.0.6 |2025-08-18 |CRAN (R 4.4.1) | |vctrs |0.6.5 |2023-12-01 |CRAN (R 4.4.0) | |vroom |1.6.5 |2023-12-05 |CRAN (R 4.4.0) | |withr |3.0.2 |2024-10-28 |CRAN (R 4.4.1) |