Merge branch 'prerelease' into nhall6-author-updates

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: OhdsiShinyModules
 Type: Package
 Title: Repository of Shiny Modules for OHDSI Result Viewers
-Version: 2.1.4
+Version: 3.0.0
 Authors@R: c(
   person("Jenna", "Reps", email = "[email protected]", role = c("aut", "cre")),
   person("Nathan", "Hall", role = c("aut")),
@@ -28,18 +28,21 @@ Imports:
     htmltools,
     lubridate,
     methods,
+    openxlsx,
     ParallelLogger,
     plotly,
     purrr,
     reactable,
     readr,
+    ReportGenerator,
     RJSONIO,
     rlang,
     rmarkdown,
     scales,
     shiny, 
     shinycssloaders,
     shinydashboard,
+    shinyglide,
     shinyWidgets,
     SqlRender,
     stringi,
@@ -58,6 +61,6 @@ Suggests:
     testthat,
     withr
 Remotes:
-    ohdsi/CirceR,
+    ohdsi/ReportGenerator,
     ohdsi/ResultModelManager
 RoxygenNote: 7.3.1

NAMESPACE

@@ -4,18 +4,10 @@ export(LargeDataTable)
 export(aboutHelperFile)
 export(aboutServer)
 export(aboutViewer)
-export(characterizationAggregateFeaturesServer)
-export(characterizationAggregateFeaturesViewer)
-export(characterizationDechallengeRechallengeServer)
-export(characterizationDechallengeRechallengeViewer)
 export(characterizationHelperFile)
 export(characterizationIncidenceServer)
 export(characterizationIncidenceViewer)
 export(characterizationServer)
-export(characterizationTableServer)
-export(characterizationTableViewer)
-export(characterizationTimeToEventServer)
-export(characterizationTimeToEventViewer)
 export(characterizationViewer)
 export(cohortCountsView)
 export(cohortDefinitionsView)
@@ -30,9 +22,6 @@ export(cohortMethodAttritionServer)
 export(cohortMethodAttritionViewer)
 export(cohortMethodCovariateBalanceServer)
 export(cohortMethodCovariateBalanceViewer)
-export(cohortMethodDiagnosticsSummaryServer)
-export(cohortMethodDiagnosticsSummaryViewer)
-export(cohortMethodHelperFile)
 export(cohortMethodKaplanMeierServer)
 export(cohortMethodKaplanMeierViewer)
 export(cohortMethodPopulationCharacteristicsServer)
@@ -43,12 +32,8 @@ export(cohortMethodPropensityModelServer)
 export(cohortMethodPropensityModelViewer)
 export(cohortMethodPropensityScoreDistServer)
 export(cohortMethodPropensityScoreDistViewer)
-export(cohortMethodResultSummaryServer)
-export(cohortMethodResultSummaryViewer)
-export(cohortMethodServer)
 export(cohortMethodSystematicErrorServer)
 export(cohortMethodSystematicErrorViewer)
-export(cohortMethodViewer)
 export(cohortOverlapView)
 export(compareCohortCharacterizationView)
 export(conceptsInDataSourceView)
@@ -65,11 +50,15 @@ export(databaseInformationView)
 export(datasourcesHelperFile)
 export(datasourcesServer)
 export(datasourcesViewer)
-export(evidenceSynthesisHelperFile)
-export(evidenceSynthesisServer)
-export(evidenceSynthesisViewer)
+export(estimationHelperFile)
+export(estimationServer)
+export(estimationViewer)
 export(getEnabledCdReports)
+export(getExampleConnectionDetails)
 export(getLogoImage)
+export(homeHelperFile)
+export(homeServer)
+export(homeViewer)
 export(incidenceRatesView)
 export(inclusionRulesView)
 export(indexEventBreakdownView)
@@ -103,9 +92,9 @@ export(patientLevelPredictionViewer)
 export(phevaluatorHelperFile)
 export(phevaluatorServer)
 export(phevaluatorViewer)
-export(sccsHelperFile)
-export(sccsServer)
-export(sccsView)
+export(reportHelperFile)
+export(reportServer)
+export(reportViewer)
 export(timeDistributionsView)
 export(visitContextView)
 importFrom(dplyr,"%>%")

NEWS.md

@@ -1,3 +1,20 @@
+OhdsiShinyModules v2.2.1
+========================
+- Fixed issue in DatabaseConnector check for pooled connections of sqlite databases on cohort diagnotiscs load (from main hotfix)
+
+OhdsiShinyModules v2.2.0
+========================
+- Combined cohort method, sccs and evidence synthesis into one estimation module with shared target and outcome ids
+- Characterizations now share the target id 
+- Updated tests to get them all working
+- Cleaned R check (but cohort incidence still has many notes)
+
+
+OhdsiShinyModules v2.1.5
+========================
+Fixed bug of orphan concepts report not displaying
+Fixed bug in orphan concepts where negative database ids were causing dynamic sql queries to crash
+
 OhdsiShinyModules v2.1.4
 ========================
 Fixed missing call to dplyr in CohortDiagnostics load up

R/OhdsiShinyModules.R

@@ -20,8 +20,8 @@
 #' 
 #' @description A selection of shiny modules for exploring standardized OHDSI results 
 #'
-#' @docType package
 #' @name OhdsiShinyModules
+#' @keywords internal
 #' @importFrom dplyr %>%
 #' @importFrom rlang .data
-NULL
+"_PACKAGE"