small cd bugs (#191)

* Index event breakdown report added to select input navigation

* database selection in cd time distribution tab

* database name in cohort diagnostics cohort counts simple tab

NAMESPACE

@@ -104,8 +104,6 @@ export(predictionSettingsViewer)
 export(predictionValidationServer)
 export(predictionValidationViewer)
 export(predictionViewer)
-export(resultTableServer)
-export(resultTableViewer)
 export(sccsDiagnosticsSummaryServer)
 export(sccsDiagnosticsSummaryViewer)
 export(sccsHelperFile)

R/cohort-diagnostics-definition.R

@@ -613,18 +613,20 @@ cohortDefinitionsModule <- function(id,
         if (!hasData(data)) {
           return(NULL)
         }
+
         data <- data %>%
+          dplyr::inner_join(databaseTable, by = "databaseId") %>%
           dplyr::filter(.data$cohortId == selectedCohortDefinitionRow()$cohortId) %>%
           dplyr::filter(.data$databaseId %in% databaseTable$databaseId) %>%
-          dplyr::select("databaseId",
+          dplyr::select("databaseName",
                         "cohortSubjects",
                         "cohortEntries") %>%
           dplyr::rename("persons" = "cohortSubjects",
                         "events" = "cohortEntries")
 
         shiny::validate(shiny::need(hasData(data), "There is no data for this cohort."))
 
-        keyColumns <- c("databaseId")
+        keyColumns <- c("databaseName")
         dataColumns <- c("persons", "events")
 
         displayTable <- getDisplayTableSimple(data = data,

R/cohort-diagnostics-main.R

@@ -418,7 +418,7 @@ cohortDiagnosticsSever <- function(id,
       if ("temporalCovariateValue" %in% dataSource$enabledReports) {
         selection["Cohort Characterization"] <- "characterization"
         selection["Compare Cohort Characterization"] <- "compareCohortCharacterization"
-        selection["Time Distributions"] <- "timeDistributions"
+        selection["Time Distributions"] <- "timeDistribution"
       }
 
       if ("relationship" %in% dataSource$enabledReports)
@@ -439,6 +439,9 @@ cohortDiagnosticsSever <- function(id,
       if ("orphanConcepts" %in% dataSource$enabledReports)
         selection["Orphan Concepts"] <- "orphanConcepts"
 
+      if ("indexEventBreakdown" %in% dataSource$enabledReports)
+        selection["Index Event Breakdown"] <- "indexEventBreakdown"
+
       shiny::updateSelectInput(
         inputId = "tabs",
         label = "Select Report",

R/components-data-viewer.R

@@ -12,7 +12,6 @@
 #' @param downloadedFileName string, desired name of downloaded data file. can use the name from the module that is being used
 #'
 #' @return shiny module UI
-#' @export
 #'
 resultTableViewer <- function(id = "result-table",
                               downloadedFileName = NULL) {
@@ -142,7 +141,6 @@ ohdsiReactableTheme <- reactable::reactableTheme(
 #' @param downloadedFileName string, desired name of downloaded data file. can use the name from the module that is being used
 #'
 #' @return shiny module server
-#' @export
 #'
 resultTableServer <- function(id, #string
                               df, #data.frame

inst/cohort-diagnostics-ref/migrations.csv

@@ -2,4 +2,4 @@ migrationFile,migrationOrder
 Migration_1-v3_1_0_time_id.sql,1
 Migration_2-v3_1_0_ir_person_years.sql,2
 Migration_3-v3_2_0_suport_cohort_subsets.sql,3
-Migration_4-v3_2_1_cohort_name_field.sql,4
+Migration_4-v3_2_1_cohort_name_field.sql,4