From c118c85de2546ed7706174427b9c27d3004bd0fd Mon Sep 17 00:00:00 2001 From: Gowtham Rao Date: Thu, 11 Aug 2022 19:04:21 -0400 Subject: [PATCH] Visit context should not have radio button for persons and records https://github.com/OHDSI/CohortDiagnostics/issues/893#issuecomment-1212574861 --- .../R/VisitContextModule.R | 19 +++-------- .../tests/test-VisitContextModule.R | 32 +++++++++---------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R b/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R index 62bbf1080..b03ff94dc 100644 --- a/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R +++ b/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R @@ -24,15 +24,6 @@ visitContextView <- function(id) { inline = TRUE ) ), - tags$td( - shiny::radioButtons( - inputId = ns("visitContextPersonOrRecords"), - label = "Display", - choices = c("Persons", "Records"), - selected = "Persons", - inline = TRUE - ) - ), tags$td( align = "right", ) @@ -76,8 +67,8 @@ visitContextModule <- function(id, return(visitContext) }) - ## getVisitContexDataEnhanced---- - getVisitContexDataEnhanced <- shiny::reactive(x = { #spelling error here missing the t in Context + ## getVisitContextDataEnhanced---- + getVisitContextDataEnhanced <- shiny::reactive(x = { visitContextData <- getVisitContextData() %>% dplyr::rename(visitContextSubject = .data$subjects) if (!hasData(visitContextData)) { @@ -152,7 +143,7 @@ visitContextModule <- function(id, output$visitContextTable <- reactable::renderReactable(expr = { validate(need(length(selectedDatabaseIds()) > 0, "No data sources chosen")) validate(need(length(targetCohortId()) > 0, "No cohorts chosen")) - data <- getVisitContexDataEnhanced() + data <- getVisitContextDataEnhanced() validate(need( nrow(data) > 0, "No data available for selected combination." @@ -183,7 +174,7 @@ visitContextModule <- function(id, databaseIds = selectedDatabaseIds(), cohortIds = targetCohortId(), source = "cohort", - fields = input$visitContextPersonOrRecords + fields = "Persons" ) if (!hasData(countsForHeader)) { return(NULL) @@ -208,4 +199,4 @@ visitContextModule <- function(id, ) }) }) -} \ No newline at end of file +} diff --git a/inst/shiny/DiagnosticsExplorer/tests/test-VisitContextModule.R b/inst/shiny/DiagnosticsExplorer/tests/test-VisitContextModule.R index 993306ee1..d7babde48 100644 --- a/inst/shiny/DiagnosticsExplorer/tests/test-VisitContextModule.R +++ b/inst/shiny/DiagnosticsExplorer/tests/test-VisitContextModule.R @@ -23,9 +23,9 @@ test_that("Visit context page", { # Checking to see if a dataframe is returned and all the elements are of the # correct datatype checkmate::expect_data_frame(getVisitContextData()) - checkmate::expect_data_frame(getVisitContexDataEnhanced()) - checkmate::expect_character(getVisitContexDataEnhanced()$databaseId) - checkmate::expect_character(getVisitContexDataEnhanced()$visitConceptName) + checkmate::expect_data_frame(getVisitContextDataEnhanced()) + checkmate::expect_character(getVisitContextDataEnhanced()$databaseId) + checkmate::expect_character(getVisitContextDataEnhanced()$visitConceptName) # Initializing vectors with column names @@ -38,23 +38,23 @@ test_that("Visit context page", { # Checking to see if the appropriate columns are represented in the data table # depending on what filtering selection is utilized if (input$visitContextTableFilters == "Before"){ - checkmate::expect_numeric(getVisitContexDataEnhanced()$Before) - testthat::expect_equal(colnames(getVisitContexDataEnhanced()), before_vec) + checkmate::expect_numeric(getVisitContextDataEnhanced()$Before) + testthat::expect_equal(colnames(getVisitContextDataEnhanced()), before_vec) } else if (input$visitContextTableFilters == "During"){ - checkmate::expect_numeric(getVisitContexDataEnhanced()$During) - testthat::expect_equal(colnames(getVisitContexDataEnhanced()), during_vec) + checkmate::expect_numeric(getVisitContextDataEnhanced()$During) + testthat::expect_equal(colnames(getVisitContextDataEnhanced()), during_vec) } else if (input$visitContextTableFilters == "Simultaneous"){ - checkmate::expect_numeric(getVisitContexDataEnhanced()$Simultaneous) - testthat::expect_equal(colnames(getVisitContexDataEnhanced()), simul_vec) + checkmate::expect_numeric(getVisitContextDataEnhanced()$Simultaneous) + testthat::expect_equal(colnames(getVisitContextDataEnhanced()), simul_vec) } else if (input$visitContextTableFilters == "After"){ - checkmate::expect_numeric(getVisitContexDataEnhanced()$After) - testthat::expect_equal(colnames(getVisitContexDataEnhanced()), after_vec) + checkmate::expect_numeric(getVisitContextDataEnhanced()$After) + testthat::expect_equal(colnames(getVisitContextDataEnhanced()), after_vec) } else if (input$visitContextTableFilters == "All"){ - checkmate::expect_numeric(getVisitContexDataEnhanced()$Before) - checkmate::expect_numeric(getVisitContexDataEnhanced()$During) - checkmate::expect_numeric(getVisitContexDataEnhanced()$Simultaneous) - checkmate::expect_numeric(getVisitContexDataEnhanced()$After) - testthat::expect_equal(colnames(getVisitContexDataEnhanced()), all_vec) + checkmate::expect_numeric(getVisitContextDataEnhanced()$Before) + checkmate::expect_numeric(getVisitContextDataEnhanced()$During) + checkmate::expect_numeric(getVisitContextDataEnhanced()$Simultaneous) + checkmate::expect_numeric(getVisitContextDataEnhanced()$After) + testthat::expect_equal(colnames(getVisitContextDataEnhanced()), all_vec) } })