From e5b702a1836d012903c0c3b1c582275a925317f5 Mon Sep 17 00:00:00 2001 From: Andreas Gammelgaard Damsbo Date: Mon, 3 Mar 2025 08:44:46 +0100 Subject: [PATCH] minor fixes --- R/app_version.R | 2 +- R/redcap_read_shiny_module.R | 4 +-- inst/apps/freesearcheR/app.R | 8 +++--- .../shinyapps.io/agdamsbo/freesearcheR.dcf | 2 +- inst/apps/freesearcheR/server.R | 27 ------------------- 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/R/app_version.R b/R/app_version.R index dab7d5b..2fa4409 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'250227_1333' +app_version <- function()'250227_1342' diff --git a/R/redcap_read_shiny_module.R b/R/redcap_read_shiny_module.R index 737f223..9da0289 100644 --- a/R/redcap_read_shiny_module.R +++ b/R/redcap_read_shiny_module.R @@ -187,7 +187,7 @@ m_redcap_readServer <- function(id) { datamods:::insert_alert( selector = ns("connect"), status = "success", - make_success_alert( + include_data_alert( dataIdName = "see_data", extra = tags$p(tags$b(phosphoricons::ph("check", weight = "bold"), "Connected to server!"), tags$p(paste0(data_rv$project_name, " loaded."))), btn_show_data = TRUE @@ -306,7 +306,7 @@ m_redcap_readServer <- function(id) { #' @importFrom htmltools tagList tags #' @importFrom shiny icon getDefaultReactiveDomain -make_success_alert <- function(dataIdName = "see_data", +include_data_alert <- function(dataIdName = "see_data", btn_show_data, see_data_text = "Click to see data", extra = NULL, diff --git a/inst/apps/freesearcheR/app.R b/inst/apps/freesearcheR/app.R index 582ba77..d8f7600 100644 --- a/inst/apps/freesearcheR/app.R +++ b/inst/apps/freesearcheR/app.R @@ -10,7 +10,7 @@ #### Current file: R//app_version.R ######## -app_version <- function()'250227_1333' +app_version <- function()'250227_1342' ######## @@ -2531,7 +2531,7 @@ m_redcap_readServer <- function(id) { datamods:::insert_alert( selector = ns("connect"), status = "success", - make_success_alert( + include_data_alert( dataIdName = "see_data", extra = tags$p(tags$b(phosphoricons::ph("check", weight = "bold"), "Connected to server!"), tags$p(paste0(data_rv$project_name, " loaded."))), btn_show_data = TRUE @@ -2650,7 +2650,7 @@ m_redcap_readServer <- function(id) { #' @importFrom htmltools tagList tags #' @importFrom shiny icon getDefaultReactiveDomain -make_success_alert <- function(dataIdName = "see_data", +include_data_alert <- function(dataIdName = "see_data", btn_show_data, see_data_text = "Click to see data", extra = NULL, @@ -5063,7 +5063,7 @@ ui_elements <- list( label = NULL, min = 0, max = 100, - step = 10, + step = 5, value = 70, format = shinyWidgets::wNumbFormat(decimals = 0), color = datamods:::get_primary_color() diff --git a/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf b/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf index 2c5d94f..5967f31 100644 --- a/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf +++ b/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf @@ -5,6 +5,6 @@ account: agdamsbo server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 13611288 -bundleId: 9861005 +bundleId: 9864963 url: https://agdamsbo.shinyapps.io/freesearcheR/ version: 1 diff --git a/inst/apps/freesearcheR/server.R b/inst/apps/freesearcheR/server.R index c6a331e..93b4c9d 100644 --- a/inst/apps/freesearcheR/server.R +++ b/inst/apps/freesearcheR/server.R @@ -821,33 +821,6 @@ server <- function(input, output, session) { gt::tab_header(gt::md(glue::glue("**Table 2: {rv$list$regression$params$descr}**"))) }) - # shiny::observe( - # # list( - # # input$plot_model - # # ), - # { - # shiny::req(rv$list$regression$tables) - # shiny::req(input$plot_model) - # tryCatch( - # { - # out <- merge_long(rv$list$regression, input$plot_model) |> - # plot.tbl_regression( - # colour = "variable", - # facet_col = "model" - # ) - # - # rv$list$regression$plot <- out - # }, - # warning = function(warn) { - # showNotification(paste0(warn), type = "warning") - # }, - # error = function(err) { - # showNotification(paste0("Plotting failed with the following error: ", err), type = "err") - # } - # ) - # } - # ) - output$regression_plot <- shiny::renderPlot( { # shiny::req(rv$list$regression$plot)