From 0ba8d123d18558b9999566af1b61c8a05c8fe098 Mon Sep 17 00:00:00 2001 From: Spencer Childress Date: Fri, 24 Feb 2023 16:21:29 -0500 Subject: [PATCH 1/2] add chart event listeners and refactor widgets --- R/mod_profileTab.R | 13 ++++++------- R/mod_safetyGraphicsServer.R | 17 +++++++++++++++++ R/mod_safetyGraphicsUI.R | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/R/mod_profileTab.R b/R/mod_profileTab.R index 5fa4e27b..53eee72a 100644 --- a/R/mod_profileTab.R +++ b/R/mod_profileTab.R @@ -35,13 +35,11 @@ profileTabUI <- function(id){ #' #' @export -profileTab <- function(input, output, session, params){ - observe({ - #print(names(params()$data)) - #print(names(params()$settings)) - }) - - id<-safetyProfile::profile_server("profile", params) +profileTab <- function(input, output, session, params) { + id <- safetyProfile::profile_server( + "profile", + params + ) observe({ shinyjs::html( @@ -56,5 +54,6 @@ profileTab <- function(input, output, session, params){ condition = !is.null(id()) ) }) + return(id) } diff --git a/R/mod_safetyGraphicsServer.R b/R/mod_safetyGraphicsServer.R index 83e4a80a..478ca443 100644 --- a/R/mod_safetyGraphicsServer.R +++ b/R/mod_safetyGraphicsServer.R @@ -46,6 +46,23 @@ safetyGraphicsServer <- function(input, output, session, meta, mapping, domainDa }) ) + observeEvent(input$participants_selected, { + cli::cli_alert_info('Selected participant ID: {input$participants_selected}') + + # Navigate to patient profile. + #updateNavbarPage( + # session, + # "safetyGraphicsApp", + # selected = 'profile' + #) + + # Update selected participant. + updateSelectizeInput( + session, + inputId = 'profile-profile-idSelect', + selected = input$participants_selected + ) + }) #--- Chart Tab ---# # Note: Adds subtabs to chart menu - this initializes initializes chart UIs diff --git a/R/mod_safetyGraphicsUI.R b/R/mod_safetyGraphicsUI.R index 5a8fd6a6..ca229469 100644 --- a/R/mod_safetyGraphicsUI.R +++ b/R/mod_safetyGraphicsUI.R @@ -67,7 +67,12 @@ safetyGraphicsUI <- function(id, meta, domainData, mapping, standards){ tabPanel("Home", icon=icon("home"),homeTabUI(ns("home"))), tabPanel("Mapping", icon=icon("map"), mappingTabUI(ns("mapping"), meta, domainData, mapping, standards)), tabPanel("Filtering", icon=icon("filter"), filterTabUI(ns("filter"))), - tabPanel("Profile", icon=icon("person"), profileTabUI(ns("profile"))), + tabPanel( + "Profile", + icon=icon("person"), + value='profile', + profileTabUI(ns("profile")) + ), navbarMenu('Charts', icon=icon("chart-bar")), tabPanel('',icon=icon("cog"), settingsTabUI(ns("settings"))) ), From f5094e3b0746179c3c5b1bdfd46a496c21aea49f Mon Sep 17 00:00:00 2001 From: Spencer Childress Date: Fri, 24 Feb 2023 17:18:48 -0500 Subject: [PATCH 2/2] document() --- DESCRIPTION | 2 +- man/profileTab.Rd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5f73fad9..fb158011 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Depends: R (>= 4.0) License: MIT + file LICENSE Encoding: UTF-8 LazyData: true -RoxygenNote: 7.2.1 +RoxygenNote: 7.2.2 Suggests: ggplot2 (>= 3.3.0), knitr (>= 1.34), diff --git a/man/profileTab.Rd b/man/profileTab.Rd index e2d43505..d74e9f09 100644 --- a/man/profileTab.Rd +++ b/man/profileTab.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/mod_profileTab.R \name{profileTab} \alias{profileTab} -\title{Server for the filter module in safetyProfile::profile_server} +\title{Server for the patient profile in safetyProfile::profile_server} \usage{ profileTab(input, output, session, params) } @@ -21,5 +21,5 @@ profileTab(input, output, session, params) current_id } \description{ -Server for the filter module in safetyProfile::profile_server +Server for the patient profile in safetyProfile::profile_server }