diff --git a/DESCRIPTION b/DESCRIPTION index 3371445d..7b46a25b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -71,12 +71,7 @@ Imports: stRoke, data.table, viridis, - smd, - doconv, - locatexec, - magick, - pdftools, - qpdf + smd Suggests: styler, devtools, diff --git a/NEWS.md b/NEWS.md index 1feb3778..e2bb2c50 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ *NEW* Updated and slightly extended list of allowed operators for new variable creation. -*FIX* The exported MS Word documents prompted a warning. I believe that has been fixed, but required several new dependencies. +*FIX* The exported MS Word documents prompts a warning. The codebase now includes a fix, but it only works running locally, but was disabled. # FreesearchR 25.12.5 diff --git a/R/sysdata.rda b/R/sysdata.rda index 19ccc239..d1c8f1da 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/R/table-download-module.R b/R/table-download-module.R index 23439105..baa566fa 100644 --- a/R/table-download-module.R +++ b/R/table-download-module.R @@ -11,7 +11,7 @@ table_download_ui <- function(id, title = "Table", ...) { selected = NULL, choices = list( "MS Word" = "docx", - "Open document format" = "rtf" + "Compatible (rtf)" = "rtf" ) ), shiny::br(), @@ -66,11 +66,14 @@ table_download_server <- function(id, data, file_name = "table", ...) { data = table, filename = file # Save to the file path provided by downloadHandler ) - if (type == "docx") { - out |> doconv::docx_update() - } else { - out - } + # This only works locally and was disabled + # if (type == "docx") { + # out |> doconv::docx_update() + # } else { + # out + # } + + out }, error = function(err) { shiny::showNotification(paste0(i18n$t("Error: "), err), type = "error") diff --git a/SESSION.md b/SESSION.md index 9c16e40e..919f71e1 100644 --- a/SESSION.md +++ b/SESSION.md @@ -26,6 +26,8 @@ |apexcharter |0.4.4 |2024-09-06 |CRAN (R 4.4.1) | |askpass |1.2.1 |2024-10-04 |CRAN (R 4.4.1) | |assertthat |0.2.1 |2019-03-21 |CRAN (R 4.4.1) | +|attachment |0.4.5 |2025-03-14 |CRAN (R 4.4.1) | +|attempt |0.3.1 |2020-05-03 |CRAN (R 4.4.1) | |backports |1.5.0 |2024-05-23 |CRAN (R 4.4.1) | |base64enc |0.1-3 |2015-07-28 |CRAN (R 4.4.1) | |bayestestR |0.17.0 |2025-08-29 |CRAN (R 4.4.1) | @@ -63,6 +65,7 @@ |devtools |2.4.6 |2025-10-03 |CRAN (R 4.4.1) | |DHARMa |0.4.7 |2024-10-18 |CRAN (R 4.4.1) | |digest |0.6.39 |2025-11-19 |CRAN (R 4.4.3) | +|dockerfiler |0.2.5 |2025-05-07 |CRAN (R 4.4.1) | |doconv |0.3.3 |2025-08-18 |CRAN (R 4.4.1) | |doParallel |1.0.17 |2022-02-07 |CRAN (R 4.4.0) | |dplyr |1.1.4 |2023-11-17 |CRAN (R 4.4.0) | @@ -208,6 +211,7 @@ |sessioninfo |1.2.3 |2025-02-05 |CRAN (R 4.4.1) | |shiny |1.12.1 |2025-12-09 |CRAN (R 4.4.1) | |shiny.i18n |0.3.0 |2023-01-16 |CRAN (R 4.4.0) | +|shiny2docker |0.0.3 |2025-06-28 |CRAN (R 4.4.1) | |shinybusy |0.3.3 |2024-03-09 |CRAN (R 4.4.0) | |shinyjs |2.1.0 |2021-12-23 |CRAN (R 4.4.0) | |shinyTime |1.0.3 |2022-08-19 |CRAN (R 4.4.0) | @@ -242,4 +246,5 @@ |xml2 |1.5.1 |2025-12-01 |CRAN (R 4.4.3) | |xtable |1.8-4 |2019-04-21 |CRAN (R 4.4.1) | |yaml |2.3.11 |2025-11-28 |CRAN (R 4.4.3) | +|yesno |0.1.3 |2024-07-26 |CRAN (R 4.4.1) | |zip |2.3.3 |2025-05-13 |CRAN (R 4.4.1) | diff --git a/app_docker/app.R b/app_docker/app.R index 24fa4cf6..a6dd12ce 100644 --- a/app_docker/app.R +++ b/app_docker/app.R @@ -1,7 +1,7 @@ ######## -#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpaYL5kU/file9c7175d0a25d.R +#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpaYL5kU/file9c7113e28000.R ######## i18n_path <- here::here("translations") @@ -9855,7 +9855,7 @@ table_download_ui <- function(id, title = "Table", ...) { selected = NULL, choices = list( "MS Word" = "docx", - "Open document format" = "rtf" + "Compatible (rtf)" = "rtf" ) ), shiny::br(), @@ -9910,11 +9910,14 @@ table_download_server <- function(id, data, file_name = "table", ...) { data = table, filename = file # Save to the file path provided by downloadHandler ) - if (type == "docx") { - out |> doconv::docx_update() - } else { - out - } + # This only works locally and was disabled + # if (type == "docx") { + # out |> doconv::docx_update() + # } else { + # out + # } + + out }, error = function(err) { shiny::showNotification(paste0(i18n$t("Error: "), err), type = "error") @@ -14114,14 +14117,16 @@ server <- function(input, output, session) { output_format = format, input = file.path(getwd(), "www/report.rmd") ) + # This only works locally and was disabled + # if (type == "docx") { + # ## This handles the the following MS Word warning: + # ## >> "This document contains fields that may refer to other files." + # out |> doconv::docx_update() + # } else { + # out + # } - if (type == "docx") { - ## This handles the the following MS Word warning: - ## >> "This document contains fields that may refer to other files." - out |> doconv::docx_update() - } else { - out - } + out }, error = function(err) { showNotification(paste0(i18n$t("We encountered the following error creating your report: "), err), type = "err") diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R index 62c12b77..0f4e390e 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//RtmpaYL5kU/file9c716ca74d18.R +#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpaYL5kU/file9c715011d086.R ######## i18n_path <- system.file("translations", package = "FreesearchR") @@ -9855,7 +9855,7 @@ table_download_ui <- function(id, title = "Table", ...) { selected = NULL, choices = list( "MS Word" = "docx", - "Open document format" = "rtf" + "Compatible (rtf)" = "rtf" ) ), shiny::br(), @@ -9910,11 +9910,14 @@ table_download_server <- function(id, data, file_name = "table", ...) { data = table, filename = file # Save to the file path provided by downloadHandler ) - if (type == "docx") { - out |> doconv::docx_update() - } else { - out - } + # This only works locally and was disabled + # if (type == "docx") { + # out |> doconv::docx_update() + # } else { + # out + # } + + out }, error = function(err) { shiny::showNotification(paste0(i18n$t("Error: "), err), type = "error") @@ -14114,14 +14117,16 @@ server <- function(input, output, session) { output_format = format, input = file.path(getwd(), "www/report.rmd") ) + # This only works locally and was disabled + # if (type == "docx") { + # ## This handles the the following MS Word warning: + # ## >> "This document contains fields that may refer to other files." + # out |> doconv::docx_update() + # } else { + # out + # } - if (type == "docx") { - ## This handles the the following MS Word warning: - ## >> "This document contains fields that may refer to other files." - out |> doconv::docx_update() - } else { - out - } + out }, error = function(err) { showNotification(paste0(i18n$t("We encountered the following error creating your report: "), err), type = "err")