diff --git a/R/hosted_version.R b/R/hosted_version.R index 32d9fe0..a898784 100644 --- a/R/hosted_version.R +++ b/R/hosted_version.R @@ -1 +1 @@ -hosted_version <- function()'v25.5.4-250512' +hosted_version <- function()'v25.5.4-250513' diff --git a/R/regression-module.R b/R/regression-module.R index 57806bd..4d7f656 100644 --- a/R/regression-module.R +++ b/R/regression-module.R @@ -486,7 +486,7 @@ regression_server <- function(id, tryCatch( { parameters <- list( - add_p = input$add_regression_p == "no" + p.values = input$add_regression_p == "no" ) out <- lapply(rv$list$regression$models, \(.x){ @@ -499,16 +499,6 @@ regression_server <- function(id, ) }) - # if (input$add_regression_p == "no") { - # out <- out |> - # lapply(\(.x){ - # .x |> - # gtsummary::modify_column_hide( - # column = "p.value" - # ) - # }) - # } - rv$list$regression$models |> purrr::imap(\(.x, .i){ rv$list$regression$models[[.i]][["code_table"]] <- paste( @@ -532,11 +522,19 @@ regression_server <- function(id, } ) + output$table2 <- gt::render_gt({ ## Print checks if a regression table is present if (!is.null(rv$list$regression$tables)) { - rv$list$regression$tables |> - tbl_merge() |> + out <- rv$list$regression$tables |> + tbl_merge() + + if (input$add_regression_p == "no") { + out <- out |> + gtsummary::modify_column_hide(column = dplyr::starts_with("p.value")) + } + + out |> gtsummary::as_gt() |> gt::tab_header(gt::md(glue::glue("**Table 2: {rv$list$regression$params$descr}**"))) } else { diff --git a/R/regression_table.R b/R/regression_table.R index 71e9927..557359b 100644 --- a/R/regression_table.R +++ b/R/regression_table.R @@ -46,6 +46,13 @@ #' args.list = list(family = stats::binomial(link = "logit")) #' ) |> #' regression_table() +#' mtcars|> +#' regression_model( +#' outcome.str = "mpg", +#' args.list = NULL) +#' ) |> +#' regression_table() +#' #' #' list( #' "Univariable" = regression_model_uv, diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R index 7882c2c..a018072 100644 --- a/inst/apps/FreesearchR/app.R +++ b/inst/apps/FreesearchR/app.R @@ -3996,7 +3996,7 @@ simple_snake <- function(data){ #### Current file: /Users/au301842/FreesearchR/R//hosted_version.R ######## -hosted_version <- function()'v25.5.4-250512' +hosted_version <- function()'v25.5.4-250513' ######## @@ -7040,6 +7040,13 @@ symmetrical_scale_x_log10 <- function(plot, breaks = c(1, 2, 3, 5, 10), ...) { #' args.list = list(family = stats::binomial(link = "logit")) #' ) |> #' regression_table() +#' mtcars|> +#' regression_model( +#' outcome.str = "mpg", +#' args.list = NULL) +#' ) |> +#' regression_table() +#' #' #' list( #' "Univariable" = regression_model_uv, @@ -7662,7 +7669,7 @@ regression_server <- function(id, tryCatch( { parameters <- list( - add_p = input$add_regression_p == "no" + p.values = input$add_regression_p == "no" ) out <- lapply(rv$list$regression$models, \(.x){ @@ -7675,16 +7682,6 @@ regression_server <- function(id, ) }) - # if (input$add_regression_p == "no") { - # out <- out |> - # lapply(\(.x){ - # .x |> - # gtsummary::modify_column_hide( - # column = "p.value" - # ) - # }) - # } - rv$list$regression$models |> purrr::imap(\(.x, .i){ rv$list$regression$models[[.i]][["code_table"]] <- paste( @@ -7708,11 +7705,19 @@ regression_server <- function(id, } ) + output$table2 <- gt::render_gt({ ## Print checks if a regression table is present if (!is.null(rv$list$regression$tables)) { - rv$list$regression$tables |> - tbl_merge() |> + out <- rv$list$regression$tables |> + tbl_merge() + + if (input$add_regression_p == "no") { + out <- out |> + gtsummary::modify_column_hide(column = dplyr::starts_with("p.value")) + } + + out |> gtsummary::as_gt() |> gt::tab_header(gt::md(glue::glue("**Table 2: {rv$list$regression$params$descr}**"))) } else { diff --git a/man/regression_table.Rd b/man/regression_table.Rd index 4a47c6f..d319247 100644 --- a/man/regression_table.Rd +++ b/man/regression_table.Rd @@ -58,6 +58,13 @@ gtsummary::trial |> args.list = list(family = stats::binomial(link = "logit")) ) |> regression_table() +mtcars|> + regression_model( + outcome.str = "mpg", + args.list = NULL) + ) |> + regression_table() + list( "Univariable" = regression_model_uv,