Visit context should not have radio button for persons and records

#893 (comment)
OHDSI · Aug 11, 2022 · c118c85 · c118c85
1 parent f5eb7bc
commit c118c85
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git 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,
       )
     })
   })
-}
+}
diff --git 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)
     }
 
   })