From 42bc9333ba589d39ff2977302026b0f0a211a40e Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:52:48 -0500 Subject: [PATCH 1/4] Add configuration option --- R/mod_main_sidebar.R | 22 +++++++++++++--------- R/mod_queries.R | 9 ++++++--- inst/golem-config.yml | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/R/mod_main_sidebar.R b/R/mod_main_sidebar.R index 2bec83b3..ff96d279 100644 --- a/R/mod_main_sidebar.R +++ b/R/mod_main_sidebar.R @@ -16,8 +16,11 @@ mod_main_sidebar_ui <- function(id){ bslib::card_header(mod_navigate_forms_ui(ns("navigate_forms_1"))), htmltools::HTML("

"), mod_review_forms_ui(ns("review_forms_1")), - htmltools::HTML("

"), - mod_query_add_ui(ns("write_query")) + if (isTRUE(get_golem_config("allow_query_inputs"))) + tagList( + htmltools::HTML("

"), + mod_query_add_ui(ns("write_query")) + ) ) ) ), @@ -101,13 +104,14 @@ mod_main_sidebar_server <- function( ) }) - mod_query_add_server( - id = "write_query", - r = r, - active_form = reactive(navinfo$active_form), - db_path = db_path, - available_data = available_data - ) + if (isTRUE(get_golem_config("allow_query_inputs"))) + mod_query_add_server( + id = "write_query", + r = r, + active_form = reactive(navinfo$active_form), + db_path = db_path, + available_data = available_data + ) mod_review_forms_server( id = "review_forms_1", diff --git a/R/mod_queries.R b/R/mod_queries.R index be56b259..7903c21c 100644 --- a/R/mod_queries.R +++ b/R/mod_queries.R @@ -42,7 +42,8 @@ mod_queries_ui <- function(id){ ), full_screen = TRUE ), - mod_query_follow_up_ui(ns("query_follow_up_1")) + if (isTRUE(get_golem_config("allow_query_inputs"))) + mod_query_follow_up_ui(ns("query_follow_up_1")) ) ) ) @@ -98,8 +99,10 @@ mod_queries_server <- function(id, r, navinfo, all_forms, db_path, table_names){ dplyr::mutate(reviewer = paste0(reviewer, " ", timestamp)) }) - mod_query_follow_up_server("query_follow_up_1", r = r, - selected_query = selected_query, db_path = db_path) + if (isTRUE(get_golem_config("allow_query_inputs"))) + mod_query_follow_up_server("query_follow_up_1", r = r, + selected_query = selected_query, + db_path = db_path) initial_queries <- reactive({ df <- with(r$query_data, r$query_data[n == 1, ] ) diff --git a/inst/golem-config.yml b/inst/golem-config.yml index 19beab51..38c882b8 100644 --- a/inst/golem-config.yml +++ b/inst/golem-config.yml @@ -11,6 +11,7 @@ default: Medical Monitor: medical_monitor Data Manager: data_manager allow_to_review: [admin, medical_monitor] + allow_query_inputs: TRUE dev: golem_wd: !expr golem::pkg_path() test: From 88dbb9d6547a9df708a1ddd10bc4ece76fc8cdf2 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:53:51 -0500 Subject: [PATCH 2/4] Update version and NEWS --- DESCRIPTION | 2 +- NEWS.md | 1 + inst/golem-config.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6e7b8ac4..f6824172 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: clinsight Title: ClinSight -Version: 0.1.1.9012 +Version: 0.1.1.9013 Authors@R: c( person("Leonard Daniël", "Samson", , "lsamson@gcp-service.com", role = c("cre", "aut"), comment = c(ORCID = "0000-0002-6252-7639")), diff --git a/NEWS.md b/NEWS.md index 60071c47..9cd520b2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,7 @@ - Add a logging table to the DB for reviews. - Simplify pulling data from DB for reviews. - Review data by records IDs instead of subject & form +- Make query handling a configurable option ## Bug fixes diff --git a/inst/golem-config.yml b/inst/golem-config.yml index 38c882b8..4c34df69 100644 --- a/inst/golem-config.yml +++ b/inst/golem-config.yml @@ -1,6 +1,6 @@ default: golem_name: clinsight - golem_version: 0.1.1.9012 + golem_version: 0.1.1.9013 app_prod: no user_identification: test_user study_data: !expr clinsight::clinsightful_data From c221f3f48e68b4a138dcff811074cf1f6c5a45f9 Mon Sep 17 00:00:00 2001 From: LDSamson Date: Thu, 9 Jan 2025 14:24:25 +0100 Subject: [PATCH 3/4] Increase version number --- DESCRIPTION | 2 +- inst/golem-config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f6824172..ec80cabb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: clinsight Title: ClinSight -Version: 0.1.1.9013 +Version: 0.1.1.9014 Authors@R: c( person("Leonard Daniël", "Samson", , "lsamson@gcp-service.com", role = c("cre", "aut"), comment = c(ORCID = "0000-0002-6252-7639")), diff --git a/inst/golem-config.yml b/inst/golem-config.yml index 4c34df69..8dd2d37b 100644 --- a/inst/golem-config.yml +++ b/inst/golem-config.yml @@ -1,6 +1,6 @@ default: golem_name: clinsight - golem_version: 0.1.1.9013 + golem_version: 0.1.1.9014 app_prod: no user_identification: test_user study_data: !expr clinsight::clinsightful_data From e408130579083d1a1395a25ed6a1852e1cd8edf4 Mon Sep 17 00:00:00 2001 From: LDSamson Date: Thu, 9 Jan 2025 14:57:38 +0100 Subject: [PATCH 4/4] Add brackets conform tidyverse styleguide --- R/mod_main_sidebar.R | 6 ++++-- R/mod_queries.R | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/R/mod_main_sidebar.R b/R/mod_main_sidebar.R index ff96d279..3d2cd7c0 100644 --- a/R/mod_main_sidebar.R +++ b/R/mod_main_sidebar.R @@ -16,11 +16,12 @@ mod_main_sidebar_ui <- function(id){ bslib::card_header(mod_navigate_forms_ui(ns("navigate_forms_1"))), htmltools::HTML("

"), mod_review_forms_ui(ns("review_forms_1")), - if (isTRUE(get_golem_config("allow_query_inputs"))) + if (isTRUE(get_golem_config("allow_query_inputs"))) { tagList( htmltools::HTML("

"), mod_query_add_ui(ns("write_query")) ) + } ) ) ), @@ -104,7 +105,7 @@ mod_main_sidebar_server <- function( ) }) - if (isTRUE(get_golem_config("allow_query_inputs"))) + if (isTRUE(get_golem_config("allow_query_inputs"))) { mod_query_add_server( id = "write_query", r = r, @@ -112,6 +113,7 @@ mod_main_sidebar_server <- function( db_path = db_path, available_data = available_data ) + } mod_review_forms_server( id = "review_forms_1", diff --git a/R/mod_queries.R b/R/mod_queries.R index 7903c21c..3f5307cc 100644 --- a/R/mod_queries.R +++ b/R/mod_queries.R @@ -42,8 +42,9 @@ mod_queries_ui <- function(id){ ), full_screen = TRUE ), - if (isTRUE(get_golem_config("allow_query_inputs"))) + if (isTRUE(get_golem_config("allow_query_inputs"))) { mod_query_follow_up_ui(ns("query_follow_up_1")) + } ) ) ) @@ -99,10 +100,11 @@ mod_queries_server <- function(id, r, navinfo, all_forms, db_path, table_names){ dplyr::mutate(reviewer = paste0(reviewer, " ", timestamp)) }) - if (isTRUE(get_golem_config("allow_query_inputs"))) + if (isTRUE(get_golem_config("allow_query_inputs"))) { mod_query_follow_up_server("query_follow_up_1", r = r, selected_query = selected_query, db_path = db_path) + } initial_queries <- reactive({ df <- with(r$query_data, r$query_data[n == 1, ] )