Skip to content

Commit b2029cd

Browse files
Admin_mschuemiAdmin_mschuemi
Admin_mschuemi
authored and
Admin_mschuemi
committed
Trying to adapt shiny viewer to new ShinyAppBuilder interface
1 parent 4c3c32e commit b2029cd

File tree

3 files changed

+58
-9
lines changed

3 files changed

+58
-9
lines changed

NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Changes:
1515

1616
6. The results schema specifications of the `exportToCsv()` function has changed:
1717
- Removed the `attrition_fraction` and `attrition_diagnostic` fields from the `cm_diagnostics_summary ` table.
18+
- Added the `target_estimator` field to the `cm_result` add `cm_interaction_result` tables.
1819
- Added the `generalizability_max_sdm` and `generalizabiltiy_diagnostic` fields to the `cm_diagnostics_summary` table.
1920
- Added the `mean_before`, `mean_after`, `target_std_diff`, `comparator_std_diff`, and `target_comparator_std_diff` fields to both the `cm_covariate_balance` and `cm_shared_covariate_balance` tables.
2021

R/Viewer.R

+2-9
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,7 @@ launchResultsViewer <- function(connectionDetails, databaseSchema) {
208208

209209
ensureInstalled("ShinyAppBuilder")
210210
ensureInstalled("markdown")
211-
aboutModule <- ShinyAppBuilder::createDefaultAboutConfig(
212-
resultDatabaseDetails = NULL,
213-
useKeyring = TRUE
214-
)
211+
aboutModule <- ShinyAppBuilder::createDefaultAboutConfig()
215212
resultDatabaseDetails <- list(
216213
dbms = connectionDetails$dbms,
217214
tablePrefix = 'cm_',
@@ -220,13 +217,9 @@ launchResultsViewer <- function(connectionDetails, databaseSchema) {
220217
schema = databaseSchema,
221218
databaseTable = 'DATABASE_META_DATA'
222219
)
223-
cohortMethodModule <- ShinyAppBuilder::createDefaultCohortMethodConfig(
224-
resultDatabaseDetails = resultDatabaseDetails,
225-
useKeyring = TRUE
226-
)
220+
cohortMethodModule <- ShinyAppBuilder::createDefaultCohortMethodConfig()
227221
shinyAppConfig <- ShinyAppBuilder::initializeModuleConfig() %>%
228222
ShinyAppBuilder::addModuleConfig(aboutModule) %>%
229-
# addModuleConfig(cohortGeneratorModule) %>%
230223
ShinyAppBuilder::addModuleConfig(cohortMethodModule)
231224
connectionHandler <- ResultModelManager::ConnectionHandler$new(connectionDetails)
232225
ShinyAppBuilder::viewShiny(shinyAppConfig, connectionHandler)

extras/MultiAnalysesVignetteDataFetch.R

+55
Original file line numberDiff line numberDiff line change
@@ -311,3 +311,58 @@ insertExportedResultsInSqlite(sqliteFileName = file.path(folder, "export", "resu
311311
exportFolder = file.path(folder, "export"),
312312
cohorts = cohorts)
313313
launchResultsViewerUsingSqlite(sqliteFileName = file.path(folder, "export", "results.sqlite"))
314+
315+
# Upload results to SQLite using RMM -------------------------------------------
316+
databaseFile <- file.path(folder, "export", "CohortMethodResults.sqlite")
317+
connectionDetails <- DatabaseConnector::createConnectionDetails(
318+
dbms = "sqlite",
319+
server = databaseFile
320+
)
321+
createResultsDataModel(
322+
connectionDetails = connectionDetails,
323+
databaseSchema = "main",
324+
tablePrefix = ""
325+
)
326+
uploadResults(
327+
connectionDetails = connectionDetails,
328+
schema = "main",
329+
zipFileName = file.path(folder, "export", "Results_MDCD.zip"),
330+
purgeSiteDataBeforeUploading = FALSE
331+
)
332+
# Add cohort and database tables:
333+
connection <- DatabaseConnector::connect(connectionDetails)
334+
cohorts <- data.frame(
335+
cohortId = c(
336+
1118084,
337+
1124300,
338+
192671),
339+
cohortName = c(
340+
"Celecoxib",
341+
"Diclofenac",
342+
"GI Bleed"
343+
)
344+
)
345+
DatabaseConnector::insertTable(
346+
connection = connection,
347+
databaseSchema = "main",
348+
tableName = "cg_cohort_definition",
349+
data = cohorts,
350+
dropTableIfExists = TRUE,
351+
createTable = TRUE,
352+
camelCaseToSnakeCase = TRUE
353+
)
354+
databases <- tibble(
355+
database_id = "MDCR",
356+
cdm_source_name = "Merative Marketscan MDCR",
357+
cdm_source_abbreviation = "MDCR"
358+
)
359+
DatabaseConnector::insertTable(
360+
connection = connection,
361+
databaseSchema = "main",
362+
tableName = "databases",
363+
data = databases,
364+
dropTableIfExists = TRUE,
365+
createTable = TRUE
366+
)
367+
DatabaseConnector::disconnect(connection)
368+

0 commit comments

Comments
 (0)