diff --git a/R/app_version.R b/R/app_version.R index e753e43..4eb7c71 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'250207_1622' +app_version <- function()'250207_1709' diff --git a/inst/apps/data_analysis_modules/app.R b/inst/apps/data_analysis_modules/app.R index 938bd0a..95dfbb5 100644 --- a/inst/apps/data_analysis_modules/app.R +++ b/inst/apps/data_analysis_modules/app.R @@ -10,7 +10,7 @@ #### Current file: R//app_version.R ######## -app_version <- function()'250207_1622' +app_version <- function()'250207_1709' ######## @@ -4103,14 +4103,19 @@ ui_elements <- list( ) ), bslib::accordion_panel( + vlaue = "acc_cor", title = "Correlations", + icon = bsicons::bs_icon("table"), + shiny::uiOutput("outcome_var_cor"), + shiny::helpText("This variable will be excluded from the correlation plot."), + shiny::br(), shiny::sliderInput( inputId = "cor_cutoff", label = "Correlation cut-off", min = 0, max = 1, step = .02, - value = .7, + value = .8, ticks = FALSE ) ) @@ -4887,6 +4892,18 @@ server <- function(input, output, session) { } ) + output$outcome_var_cor <- shiny::renderUI({ + shiny::selectInput( + inputId = "outcome_var_cor", + selected = NULL, + label = "Select outcome variable", + choices = c( + colnames(rv$list$data) + # ,"none" + ), + multiple = FALSE + ) + }) output$table1 <- gt::render_gt({ shiny::req(rv$list$table1) @@ -4896,12 +4913,18 @@ server <- function(input, output, session) { gt::tab_header(gt::md("**Table 1: Baseline Characteristics**")) }) - data_correlations_server(id = "correlations", - data = shiny::reactive(rv$list$data), + data = shiny::reactive({ + out <- dplyr::select(rv$list$data,-!!input$outcome_var_cor) + # input$outcome_var_cor=="none"){ + # out <- rv$list$data + # } + out + }), cutoff = shiny::reactive(input$cor_cutoff)) + ############################################################################## ######### ######### Regression model analyses diff --git a/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf b/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf index 8d0b399..6890278 100644 --- a/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf +++ b/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf @@ -5,6 +5,6 @@ account: agdamsbo server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 13611288 -bundleId: +bundleId: 9765526 url: https://agdamsbo.shinyapps.io/freesearcheR/ version: 1 diff --git a/inst/apps/data_analysis_modules/server.R b/inst/apps/data_analysis_modules/server.R index 3822782..b8a3926 100644 --- a/inst/apps/data_analysis_modules/server.R +++ b/inst/apps/data_analysis_modules/server.R @@ -512,6 +512,18 @@ server <- function(input, output, session) { } ) + output$outcome_var_cor <- shiny::renderUI({ + shiny::selectInput( + inputId = "outcome_var_cor", + selected = NULL, + label = "Select outcome variable", + choices = c( + colnames(rv$list$data) + # ,"none" + ), + multiple = FALSE + ) + }) output$table1 <- gt::render_gt({ shiny::req(rv$list$table1) @@ -521,12 +533,18 @@ server <- function(input, output, session) { gt::tab_header(gt::md("**Table 1: Baseline Characteristics**")) }) - data_correlations_server(id = "correlations", - data = shiny::reactive(rv$list$data), + data = shiny::reactive({ + out <- dplyr::select(rv$list$data,-!!input$outcome_var_cor) + # input$outcome_var_cor=="none"){ + # out <- rv$list$data + # } + out + }), cutoff = shiny::reactive(input$cor_cutoff)) + ############################################################################## ######### ######### Regression model analyses diff --git a/inst/apps/data_analysis_modules/ui.R b/inst/apps/data_analysis_modules/ui.R index 2e2ac4f..bc4caa8 100644 --- a/inst/apps/data_analysis_modules/ui.R +++ b/inst/apps/data_analysis_modules/ui.R @@ -317,14 +317,19 @@ ui_elements <- list( ) ), bslib::accordion_panel( + vlaue = "acc_cor", title = "Correlations", + icon = bsicons::bs_icon("table"), + shiny::uiOutput("outcome_var_cor"), + shiny::helpText("This variable will be excluded from the correlation plot."), + shiny::br(), shiny::sliderInput( inputId = "cor_cutoff", label = "Correlation cut-off", min = 0, max = 1, step = .02, - value = .7, + value = .8, ticks = FALSE ) )