From 07573e25a32b53de4e5916206dfc6e8273d9b2e1 Mon Sep 17 00:00:00 2001 From: Mahmoud Hallal Date: Fri, 22 Jul 2022 11:49:54 +0200 Subject: [PATCH 1/4] remove titles --- R/tm_a_mmrm.R | 15 +++------------ R/tm_g_barchart_simple.R | 2 -- R/tm_g_ci.R | 2 -- R/tm_g_forest_rsp.R | 2 -- R/tm_g_forest_tte.R | 2 -- R/tm_g_ipp.R | 2 -- R/tm_g_km.R | 2 -- R/tm_g_lineplot.R | 2 -- R/tm_g_pp_adverse_events.R | 2 -- R/tm_g_pp_patient_timeline.R | 2 -- R/tm_g_pp_therapy.R | 2 -- R/tm_g_pp_vitals.R | 2 -- R/tm_t_abnormality.R | 2 -- R/tm_t_abnormality_by_worst_grade.R | 2 -- R/tm_t_ancova.R | 2 -- R/tm_t_binary_outcome.R | 2 -- R/tm_t_coxreg.R | 2 -- R/tm_t_events.R | 2 -- R/tm_t_events_by_grade.R | 2 -- R/tm_t_events_patyear.R | 2 -- R/tm_t_events_summary.R | 2 -- R/tm_t_exposure.R | 2 -- R/tm_t_logistic.R | 2 -- R/tm_t_mult_events.R | 2 -- R/tm_t_pp_basic_info.R | 2 -- R/tm_t_pp_laboratory.R | 2 -- R/tm_t_pp_medical_history.R | 2 -- R/tm_t_pp_prior_medication.R | 2 -- R/tm_t_shift_by_arm.R | 2 -- R/tm_t_shift_by_arm_by_worst.R | 2 -- R/tm_t_shift_by_grade.R | 2 -- R/tm_t_smq.R | 2 -- R/tm_t_summary.R | 2 -- R/tm_t_summary_by.R | 2 -- R/tm_t_tte.R | 2 -- 35 files changed, 3 insertions(+), 80 deletions(-) diff --git a/R/tm_a_mmrm.R b/R/tm_a_mmrm.R index d7b0d8c8e6..f27e17a665 100644 --- a/R/tm_a_mmrm.R +++ b/R/tm_a_mmrm.R @@ -595,11 +595,7 @@ ui_mmrm <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -1424,7 +1420,6 @@ srv_mmrm <- function(id, ), "header3" ) - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) if (!is.null(table_r())) { card$append_text("Table", "header3") @@ -1438,19 +1433,15 @@ srv_mmrm <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_barchart_simple.R b/R/tm_g_barchart_simple.R index 82aa878683..038321c53f 100644 --- a/R/tm_g_barchart_simple.R +++ b/R/tm_g_barchart_simple.R @@ -535,7 +535,6 @@ srv_g_barchart_simple <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Barchart Plot") card$append_text("Barchart Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -543,7 +542,6 @@ srv_g_barchart_simple <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_ci.R b/R/tm_g_ci.R index 39351cd52a..3fc43dc7ee 100644 --- a/R/tm_g_ci.R +++ b/R/tm_g_ci.R @@ -453,7 +453,6 @@ srv_g_ci <- function(id, # nolint card$set_name("CI Plot") card$append_text("CI Plot", "header2") card$append_text("Confidence Interval Plot", "header3") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -461,7 +460,6 @@ srv_g_ci <- function(id, # nolint card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_forest_rsp.R b/R/tm_g_forest_rsp.R index f2e66d4297..b813fdceb5 100644 --- a/R/tm_g_forest_rsp.R +++ b/R/tm_g_forest_rsp.R @@ -714,7 +714,6 @@ srv_g_forest_rsp <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Forest Response Plot") card$append_text("Forest Response Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -722,7 +721,6 @@ srv_g_forest_rsp <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_forest_tte.R b/R/tm_g_forest_tte.R index 3061dced0d..14df035d8c 100644 --- a/R/tm_g_forest_tte.R +++ b/R/tm_g_forest_tte.R @@ -647,7 +647,6 @@ srv_g_forest_tte <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Forest Survival Plot") card$append_text("Forest Survival Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -655,7 +654,6 @@ srv_g_forest_tte <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_ipp.R b/R/tm_g_ipp.R index d33f0140c2..766dca49b8 100644 --- a/R/tm_g_ipp.R +++ b/R/tm_g_ipp.R @@ -616,7 +616,6 @@ srv_g_ipp <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Individual Patient Plot") card$append_text("Individual Patient Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -624,7 +623,6 @@ srv_g_ipp <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_km.R b/R/tm_g_km.R index 7be51e46d5..2ff0b5e8ed 100644 --- a/R/tm_g_km.R +++ b/R/tm_g_km.R @@ -780,7 +780,6 @@ srv_g_km <- function(id, card$set_name("Kaplan Meier Plot") card$append_text("Kaplan Meier Plot", "header2") card$append_text("Non-parametric method used to estimate the survival function from lifetime data", "header3") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -788,7 +787,6 @@ srv_g_km <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_lineplot.R b/R/tm_g_lineplot.R index 2ecb5b9ef2..73559f6262 100644 --- a/R/tm_g_lineplot.R +++ b/R/tm_g_lineplot.R @@ -634,7 +634,6 @@ srv_g_lineplot <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Line Plot") card$append_text("Line Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -642,7 +641,6 @@ srv_g_lineplot <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_pp_adverse_events.R b/R/tm_g_pp_adverse_events.R index 4513067efc..a1dc788f00 100644 --- a/R/tm_g_pp_adverse_events.R +++ b/R/tm_g_pp_adverse_events.R @@ -575,7 +575,6 @@ srv_g_adverse_events <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Adverse Events Plot") card$append_text("Patient Profile Adverse Events Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -583,7 +582,6 @@ srv_g_adverse_events <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_pp_patient_timeline.R b/R/tm_g_pp_patient_timeline.R index 050cf241ac..6edce191c1 100644 --- a/R/tm_g_pp_patient_timeline.R +++ b/R/tm_g_pp_patient_timeline.R @@ -910,7 +910,6 @@ srv_g_patient_timeline <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Timeline Plot") card$append_text("Patient Profile Timeline Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -918,7 +917,6 @@ srv_g_patient_timeline <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_pp_therapy.R b/R/tm_g_pp_therapy.R index 7ae9033c14..a17e75c82e 100644 --- a/R/tm_g_pp_therapy.R +++ b/R/tm_g_pp_therapy.R @@ -745,7 +745,6 @@ srv_g_therapy <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Therapy Plot") card$append_text("Patient Profile Therapy Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -753,7 +752,6 @@ srv_g_therapy <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_g_pp_vitals.R b/R/tm_g_pp_vitals.R index 8b9000676f..44369a6cbd 100644 --- a/R/tm_g_pp_vitals.R +++ b/R/tm_g_pp_vitals.R @@ -532,7 +532,6 @@ srv_g_vitals <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Vitals Plot") card$append_text("Patient Profile Vitals Plot", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Plot", "header3") card$append_plot(plot_r(), dim = pws$dim()) @@ -540,7 +539,6 @@ srv_g_vitals <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_abnormality.R b/R/tm_t_abnormality.R index 965ebbb898..c229f4e423 100644 --- a/R/tm_t_abnormality.R +++ b/R/tm_t_abnormality.R @@ -635,7 +635,6 @@ srv_t_abnormality <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Abnormality Summary Table") card$append_text("Abnormality Summary Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -643,7 +642,6 @@ srv_t_abnormality <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_abnormality_by_worst_grade.R b/R/tm_t_abnormality_by_worst_grade.R index a6266a435d..5b603cdaf3 100644 --- a/R/tm_t_abnormality_by_worst_grade.R +++ b/R/tm_t_abnormality_by_worst_grade.R @@ -601,7 +601,6 @@ srv_t_abnormality_by_worst_grade <- function(id, # nolint card$set_name("Laboratory Test Results Table") card$append_text("Laboratory Test Results Table", "header2") card$append_text("Laboratory test results with highest grade post-baseline Table", "header3") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -609,7 +608,6 @@ srv_t_abnormality_by_worst_grade <- function(id, # nolint card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_ancova.R b/R/tm_t_ancova.R index 049cd7e20f..8eddb28c19 100644 --- a/R/tm_t_ancova.R +++ b/R/tm_t_ancova.R @@ -716,7 +716,6 @@ srv_ancova <- function(id, card$set_name("ANCOVA") card$append_text("ANCOVA", "header2") card$append_text("Analysis of Covariance", "header3") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -724,7 +723,6 @@ srv_ancova <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_binary_outcome.R b/R/tm_t_binary_outcome.R index a60599d71d..8401615d85 100644 --- a/R/tm_t_binary_outcome.R +++ b/R/tm_t_binary_outcome.R @@ -979,7 +979,6 @@ srv_t_binary_outcome <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Binary Outcome Table") card$append_text("Binary Outcome Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -987,7 +986,6 @@ srv_t_binary_outcome <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_coxreg.R b/R/tm_t_coxreg.R index 9a5fecceff..92a0de3bd3 100644 --- a/R/tm_t_coxreg.R +++ b/R/tm_t_coxreg.R @@ -1048,7 +1048,6 @@ srv_t_coxreg <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Cox Regression Table") card$append_text("Cox Regression Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -1056,7 +1055,6 @@ srv_t_coxreg <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_events.R b/R/tm_t_events.R index 6e0b80aba8..1917c4bbe7 100644 --- a/R/tm_t_events.R +++ b/R/tm_t_events.R @@ -774,7 +774,6 @@ srv_t_events_byterm <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Events by Term Table") card$append_text("Events by Term Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -782,7 +781,6 @@ srv_t_events_byterm <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_events_by_grade.R b/R/tm_t_events_by_grade.R index 0bc5b6f3eb..15fbcefa62 100644 --- a/R/tm_t_events_by_grade.R +++ b/R/tm_t_events_by_grade.R @@ -1161,7 +1161,6 @@ srv_t_events_by_grade <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Events by Grade Table") card$append_text("Events by Grade Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -1169,7 +1168,6 @@ srv_t_events_by_grade <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_events_patyear.R b/R/tm_t_events_patyear.R index 5a0670891d..5b80d51fb9 100644 --- a/R/tm_t_events_patyear.R +++ b/R/tm_t_events_patyear.R @@ -530,7 +530,6 @@ srv_events_patyear <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Event Rates Adjusted For Patient-Years Table") card$append_text("Event Rates Adjusted For Patient-Years Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -538,7 +537,6 @@ srv_events_patyear <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_events_summary.R b/R/tm_t_events_summary.R index 5e7703e0bc..78824c6c09 100644 --- a/R/tm_t_events_summary.R +++ b/R/tm_t_events_summary.R @@ -993,7 +993,6 @@ srv_t_events_summary <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Adverse Events Summary Table") card$append_text("Adverse Events Summary Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -1001,7 +1000,6 @@ srv_t_events_summary <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_exposure.R b/R/tm_t_exposure.R index b1c7191720..675ceaebf7 100644 --- a/R/tm_t_exposure.R +++ b/R/tm_t_exposure.R @@ -629,7 +629,6 @@ srv_t_exposure <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Exposure for Risk Management Plan Table") card$append_text("Exposure for Risk Management Plan Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -637,7 +636,6 @@ srv_t_exposure <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_logistic.R b/R/tm_t_logistic.R index e3087f6863..9b76d8d1ef 100644 --- a/R/tm_t_logistic.R +++ b/R/tm_t_logistic.R @@ -702,7 +702,6 @@ srv_t_logistic <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Logistic Regression Table") card$append_text("Logistic Regression Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -710,7 +709,6 @@ srv_t_logistic <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_mult_events.R b/R/tm_t_mult_events.R index 4696330fe0..b03ccb6657 100644 --- a/R/tm_t_mult_events.R +++ b/R/tm_t_mult_events.R @@ -587,7 +587,6 @@ srv_t_mult_events_byterm <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Multiple Events by Term Table") card$append_text("Multiple Events by Term Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -595,7 +594,6 @@ srv_t_mult_events_byterm <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_pp_basic_info.R b/R/tm_t_pp_basic_info.R index ac52e38cdf..da6cad05e4 100644 --- a/R/tm_t_pp_basic_info.R +++ b/R/tm_t_pp_basic_info.R @@ -262,7 +262,6 @@ srv_t_basic_info <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Basic Info Table") card$append_text("Patient Profile Basic Info Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -270,7 +269,6 @@ srv_t_basic_info <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_pp_laboratory.R b/R/tm_t_pp_laboratory.R index df7ee2cb90..5f93cb5000 100644 --- a/R/tm_t_pp_laboratory.R +++ b/R/tm_t_pp_laboratory.R @@ -453,7 +453,6 @@ srv_g_laboratory <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Profile Laboratory Table") card$append_text("Patient Profile Laboratory Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()$raw) @@ -461,7 +460,6 @@ srv_g_laboratory <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_pp_medical_history.R b/R/tm_t_pp_medical_history.R index 87b6ebb928..fa8eee2fea 100644 --- a/R/tm_t_pp_medical_history.R +++ b/R/tm_t_pp_medical_history.R @@ -349,7 +349,6 @@ srv_t_medical_history <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Medical History Table") card$append_text("Patient Medical History Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -357,7 +356,6 @@ srv_t_medical_history <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_pp_prior_medication.R b/R/tm_t_pp_prior_medication.R index d3d9aca0b3..879bca21bf 100644 --- a/R/tm_t_pp_prior_medication.R +++ b/R/tm_t_pp_prior_medication.R @@ -381,7 +381,6 @@ srv_t_prior_medication <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Patient Prior Medication Table") card$append_text("Patient Prior Medication Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -389,7 +388,6 @@ srv_t_prior_medication <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_shift_by_arm.R b/R/tm_t_shift_by_arm.R index acab590e5e..1729a256db 100644 --- a/R/tm_t_shift_by_arm.R +++ b/R/tm_t_shift_by_arm.R @@ -505,7 +505,6 @@ srv_shift_by_arm <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Shift by Arm Table") card$append_text("Shift by Arm Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -513,7 +512,6 @@ srv_shift_by_arm <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_shift_by_arm_by_worst.R b/R/tm_t_shift_by_arm_by_worst.R index 7aa710b30d..ed9838bb7a 100644 --- a/R/tm_t_shift_by_arm_by_worst.R +++ b/R/tm_t_shift_by_arm_by_worst.R @@ -531,7 +531,6 @@ srv_shift_by_arm_by_worst <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Shift by Arm by Worst Table") card$append_text("Shift by Arm by Worst Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -539,7 +538,6 @@ srv_shift_by_arm_by_worst <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_shift_by_grade.R b/R/tm_t_shift_by_grade.R index 3a04ca6851..6c860d8613 100644 --- a/R/tm_t_shift_by_grade.R +++ b/R/tm_t_shift_by_grade.R @@ -873,7 +873,6 @@ srv_t_shift_by_grade <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Grade Summary Table") card$append_text("Grade Summary Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -881,7 +880,6 @@ srv_t_shift_by_grade <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_smq.R b/R/tm_t_smq.R index 846ee5443b..f538af11b1 100644 --- a/R/tm_t_smq.R +++ b/R/tm_t_smq.R @@ -651,7 +651,6 @@ srv_t_smq <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("SMQ Table Table") card$append_text("Adverse Events Table by Standardized `MedDRA` Query (SMQ)", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -659,7 +658,6 @@ srv_t_smq <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_summary.R b/R/tm_t_summary.R index 4a934b1419..d27ea38601 100644 --- a/R/tm_t_summary.R +++ b/R/tm_t_summary.R @@ -563,7 +563,6 @@ srv_summary <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Summary Table") card$append_text("Summary Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -571,7 +570,6 @@ srv_summary <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_summary_by.R b/R/tm_t_summary_by.R index 5271aad1aa..1156e065fb 100644 --- a/R/tm_t_summary_by.R +++ b/R/tm_t_summary_by.R @@ -718,7 +718,6 @@ srv_summary_by <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Summarize Variables by Row Groups Table") card$append_text("Summarize Variables by Row Groups Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -726,7 +725,6 @@ srv_summary_by <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, diff --git a/R/tm_t_tte.R b/R/tm_t_tte.R index 7d9bb60606..814464803e 100644 --- a/R/tm_t_tte.R +++ b/R/tm_t_tte.R @@ -895,7 +895,6 @@ srv_t_tte <- function(id, card <- teal.reporter::TealReportCard$new() card$set_name("Time To Event Table") card$append_text("Time To Event Table", "header2") - card$append_text("Filter State", "header3") card$append_fs(datasets$get_filter_state()) card$append_text("Table", "header3") card$append_table(table_r()) @@ -903,7 +902,6 @@ srv_t_tte <- function(id, card$append_text("Comment", "header3") card$append_text(comment) } - card$append_text("Show R Code", "header3") card$append_src(paste(get_rcode( chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, From 11f9ecd96d190acf571f9ac87c77d0869f4f20ef Mon Sep 17 00:00:00 2001 From: Mahmoud Hallal Date: Fri, 22 Jul 2022 12:08:37 +0200 Subject: [PATCH 2/4] simple_reporter --- R/tm_a_mmrm.R | 2 +- R/tm_g_barchart_simple.R | 13 +++---------- R/tm_g_ci.R | 13 +++---------- R/tm_g_forest_rsp.R | 13 +++---------- R/tm_g_forest_tte.R | 13 +++---------- R/tm_g_ipp.R | 13 +++---------- R/tm_g_km.R | 13 +++---------- R/tm_g_lineplot.R | 13 +++---------- R/tm_g_pp_adverse_events.R | 13 +++---------- R/tm_g_pp_patient_timeline.R | 13 +++---------- R/tm_g_pp_therapy.R | 13 +++---------- R/tm_g_pp_vitals.R | 13 +++---------- R/tm_t_abnormality.R | 13 +++---------- R/tm_t_abnormality_by_worst_grade.R | 13 +++---------- R/tm_t_ancova.R | 13 +++---------- R/tm_t_binary_outcome.R | 13 +++---------- R/tm_t_coxreg.R | 13 +++---------- R/tm_t_events.R | 13 +++---------- R/tm_t_events_by_grade.R | 13 +++---------- R/tm_t_events_patyear.R | 13 +++---------- R/tm_t_events_summary.R | 13 +++---------- R/tm_t_exposure.R | 13 +++---------- R/tm_t_logistic.R | 13 +++---------- R/tm_t_mult_events.R | 13 +++---------- R/tm_t_pp_basic_info.R | 13 +++---------- R/tm_t_pp_laboratory.R | 13 +++---------- R/tm_t_pp_medical_history.R | 13 +++---------- R/tm_t_pp_prior_medication.R | 13 +++---------- R/tm_t_shift_by_arm.R | 13 +++---------- R/tm_t_shift_by_arm_by_worst.R | 13 +++---------- R/tm_t_shift_by_grade.R | 13 +++---------- R/tm_t_smq.R | 13 +++---------- R/tm_t_summary.R | 13 +++---------- R/tm_t_summary_by.R | 13 +++---------- R/tm_t_tte.R | 13 +++---------- 35 files changed, 103 insertions(+), 341 deletions(-) diff --git a/R/tm_a_mmrm.R b/R/tm_a_mmrm.R index f27e17a665..1690aeb6cb 100644 --- a/R/tm_a_mmrm.R +++ b/R/tm_a_mmrm.R @@ -1434,7 +1434,7 @@ srv_mmrm <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 2L), + chunks = teal.code::get_chunks_object(parent_idx = 1L), datasets = datasets, title = "", description = "" diff --git a/R/tm_g_barchart_simple.R b/R/tm_g_barchart_simple.R index 038321c53f..0d207ede9b 100644 --- a/R/tm_g_barchart_simple.R +++ b/R/tm_g_barchart_simple.R @@ -207,11 +207,7 @@ ui_g_barchart_simple <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -543,17 +539,14 @@ srv_g_barchart_simple <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_ci.R b/R/tm_g_ci.R index 3fc43dc7ee..ec46612eda 100644 --- a/R/tm_g_ci.R +++ b/R/tm_g_ci.R @@ -314,11 +314,7 @@ ui_g_ci <- function(id, ...) { # nolint output = teal.widgets::plot_with_settings_ui(id = ns("myplot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -461,17 +457,14 @@ srv_g_ci <- function(id, # nolint card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_forest_rsp.R b/R/tm_g_forest_rsp.R index b813fdceb5..b9e6fd4302 100644 --- a/R/tm_g_forest_rsp.R +++ b/R/tm_g_forest_rsp.R @@ -384,11 +384,7 @@ ui_g_forest_rsp <- function(id, ...) { output = teal.widgets::plot_with_settings_ui(id = ns("myplot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -722,17 +718,14 @@ srv_g_forest_rsp <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_forest_tte.R b/R/tm_g_forest_tte.R index 14df035d8c..29885a79bc 100644 --- a/R/tm_g_forest_tte.R +++ b/R/tm_g_forest_tte.R @@ -370,11 +370,7 @@ ui_g_forest_tte <- function(id, ...) { output = teal.widgets::plot_with_settings_ui(id = ns("myplot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -655,17 +651,14 @@ srv_g_forest_tte <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_ipp.R b/R/tm_g_ipp.R index 766dca49b8..66fe44ce4b 100644 --- a/R/tm_g_ipp.R +++ b/R/tm_g_ipp.R @@ -369,11 +369,7 @@ ui_g_ipp <- function(id, ...) { output = teal.widgets::plot_with_settings_ui(id = ns("myplot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -624,17 +620,14 @@ srv_g_ipp <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_km.R b/R/tm_g_km.R index 2ff0b5e8ed..6a921d1028 100644 --- a/R/tm_g_km.R +++ b/R/tm_g_km.R @@ -420,11 +420,7 @@ ui_g_km <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -788,17 +784,14 @@ srv_g_km <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_lineplot.R b/R/tm_g_lineplot.R index 73559f6262..5aa522380b 100644 --- a/R/tm_g_lineplot.R +++ b/R/tm_g_lineplot.R @@ -356,11 +356,7 @@ ui_g_lineplot <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -642,17 +638,14 @@ srv_g_lineplot <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_pp_adverse_events.R b/R/tm_g_pp_adverse_events.R index a1dc788f00..9b39f8568e 100644 --- a/R/tm_g_pp_adverse_events.R +++ b/R/tm_g_pp_adverse_events.R @@ -318,11 +318,7 @@ ui_g_adverse_events <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -583,17 +579,14 @@ srv_g_adverse_events <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_pp_patient_timeline.R b/R/tm_g_pp_patient_timeline.R index 6edce191c1..47a0be95f4 100644 --- a/R/tm_g_pp_patient_timeline.R +++ b/R/tm_g_pp_patient_timeline.R @@ -572,11 +572,7 @@ ui_g_patient_timeline <- function(id, ...) { output = teal.widgets::plot_with_settings_ui(id = ns("patient_timeline_plot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -918,17 +914,14 @@ srv_g_patient_timeline <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_pp_therapy.R b/R/tm_g_pp_therapy.R index a17e75c82e..ac00063515 100644 --- a/R/tm_g_pp_therapy.R +++ b/R/tm_g_pp_therapy.R @@ -453,11 +453,7 @@ ui_g_therapy <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -753,17 +749,14 @@ srv_g_therapy <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_g_pp_vitals.R b/R/tm_g_pp_vitals.R index 44369a6cbd..734cbc564d 100644 --- a/R/tm_g_pp_vitals.R +++ b/R/tm_g_pp_vitals.R @@ -308,11 +308,7 @@ ui_g_vitals <- function(id, ...) { output = teal.widgets::plot_with_settings_ui(id = ns("vitals_plot")), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -540,17 +536,14 @@ srv_g_vitals <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_abnormality.R b/R/tm_t_abnormality.R index c229f4e423..70a6a0bbf4 100644 --- a/R/tm_t_abnormality.R +++ b/R/tm_t_abnormality.R @@ -393,11 +393,7 @@ ui_t_abnormality <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -643,17 +639,14 @@ srv_t_abnormality <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_abnormality_by_worst_grade.R b/R/tm_t_abnormality_by_worst_grade.R index 5b603cdaf3..ec8635cb04 100644 --- a/R/tm_t_abnormality_by_worst_grade.R +++ b/R/tm_t_abnormality_by_worst_grade.R @@ -378,11 +378,7 @@ ui_t_abnormality_by_worst_grade <- function(id, ...) { # nolint output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -609,17 +605,14 @@ srv_t_abnormality_by_worst_grade <- function(id, # nolint card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_ancova.R b/R/tm_t_ancova.R index 8eddb28c19..02fbecb25d 100644 --- a/R/tm_t_ancova.R +++ b/R/tm_t_ancova.R @@ -454,11 +454,7 @@ ui_ancova <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -724,17 +720,14 @@ srv_ancova <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_binary_outcome.R b/R/tm_t_binary_outcome.R index 8401615d85..17f1d85701 100644 --- a/R/tm_t_binary_outcome.R +++ b/R/tm_t_binary_outcome.R @@ -539,11 +539,7 @@ ui_t_binary_outcome <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -987,17 +983,14 @@ srv_t_binary_outcome <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_coxreg.R b/R/tm_t_coxreg.R index 92a0de3bd3..09f9b43295 100644 --- a/R/tm_t_coxreg.R +++ b/R/tm_t_coxreg.R @@ -579,11 +579,7 @@ ui_t_coxreg <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::radioButtons( @@ -1056,17 +1052,14 @@ srv_t_coxreg <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_events.R b/R/tm_t_events.R index 1917c4bbe7..eca1eb7f57 100644 --- a/R/tm_t_events.R +++ b/R/tm_t_events.R @@ -552,11 +552,7 @@ ui_t_events_byterm <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -782,17 +778,14 @@ srv_t_events_byterm <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_events_by_grade.R b/R/tm_t_events_by_grade.R index 15fbcefa62..7a57cc1b43 100644 --- a/R/tm_t_events_by_grade.R +++ b/R/tm_t_events_by_grade.R @@ -890,11 +890,7 @@ ui_t_events_by_grade <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -1169,17 +1165,14 @@ srv_t_events_by_grade <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_events_patyear.R b/R/tm_t_events_patyear.R index 5b80d51fb9..2dbc121432 100644 --- a/R/tm_t_events_patyear.R +++ b/R/tm_t_events_patyear.R @@ -266,11 +266,7 @@ ui_events_patyear <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("patyear_table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -538,17 +534,14 @@ srv_events_patyear <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_events_summary.R b/R/tm_t_events_summary.R index 78824c6c09..273f38fd5e 100644 --- a/R/tm_t_events_summary.R +++ b/R/tm_t_events_summary.R @@ -707,11 +707,7 @@ ui_t_events_summary <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -1001,17 +997,14 @@ srv_t_events_summary <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_exposure.R b/R/tm_t_exposure.R index 675ceaebf7..e104f3d18b 100644 --- a/R/tm_t_exposure.R +++ b/R/tm_t_exposure.R @@ -398,11 +398,7 @@ ui_t_exposure <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -637,17 +633,14 @@ srv_t_exposure <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_logistic.R b/R/tm_t_logistic.R index 9b76d8d1ef..5f0fcbd05d 100644 --- a/R/tm_t_logistic.R +++ b/R/tm_t_logistic.R @@ -363,11 +363,7 @@ ui_t_logistic <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -710,17 +706,14 @@ srv_t_logistic <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_mult_events.R b/R/tm_t_mult_events.R index b03ccb6657..58cc750349 100644 --- a/R/tm_t_mult_events.R +++ b/R/tm_t_mult_events.R @@ -385,11 +385,7 @@ ui_t_mult_events_byterm <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -595,17 +591,14 @@ srv_t_mult_events_byterm <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_pp_basic_info.R b/R/tm_t_pp_basic_info.R index da6cad05e4..50734d7927 100644 --- a/R/tm_t_pp_basic_info.R +++ b/R/tm_t_pp_basic_info.R @@ -126,11 +126,7 @@ ui_t_basic_info <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -270,17 +266,14 @@ srv_t_basic_info <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_pp_laboratory.R b/R/tm_t_pp_laboratory.R index 5f93cb5000..f7bac35a1b 100644 --- a/R/tm_t_pp_laboratory.R +++ b/R/tm_t_pp_laboratory.R @@ -221,11 +221,7 @@ ui_g_laboratory <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -461,17 +457,14 @@ srv_g_laboratory <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_pp_medical_history.R b/R/tm_t_pp_medical_history.R index fa8eee2fea..e2b0124288 100644 --- a/R/tm_t_pp_medical_history.R +++ b/R/tm_t_pp_medical_history.R @@ -181,11 +181,7 @@ ui_t_medical_history <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -357,17 +353,14 @@ srv_t_medical_history <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_pp_prior_medication.R b/R/tm_t_pp_prior_medication.R index 879bca21bf..bc1b75f3d6 100644 --- a/R/tm_t_pp_prior_medication.R +++ b/R/tm_t_pp_prior_medication.R @@ -207,11 +207,7 @@ ui_t_prior_medication <- function(id, ...) { ), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -389,17 +385,14 @@ srv_t_prior_medication <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_shift_by_arm.R b/R/tm_t_shift_by_arm.R index 1729a256db..f648695d3e 100644 --- a/R/tm_t_shift_by_arm.R +++ b/R/tm_t_shift_by_arm.R @@ -299,11 +299,7 @@ ui_shift_by_arm <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -513,17 +509,14 @@ srv_shift_by_arm <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_shift_by_arm_by_worst.R b/R/tm_t_shift_by_arm_by_worst.R index ed9838bb7a..4ff97cb035 100644 --- a/R/tm_t_shift_by_arm_by_worst.R +++ b/R/tm_t_shift_by_arm_by_worst.R @@ -310,11 +310,7 @@ ui_shift_by_arm_by_worst <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -539,17 +535,14 @@ srv_shift_by_arm_by_worst <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_shift_by_grade.R b/R/tm_t_shift_by_grade.R index 6c860d8613..af5e31958d 100644 --- a/R/tm_t_shift_by_grade.R +++ b/R/tm_t_shift_by_grade.R @@ -637,11 +637,7 @@ ui_t_shift_by_grade <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -881,17 +877,14 @@ srv_t_shift_by_grade <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_smq.R b/R/tm_t_smq.R index f538af11b1..48e9355512 100644 --- a/R/tm_t_smq.R +++ b/R/tm_t_smq.R @@ -450,11 +450,7 @@ ui_t_smq <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -659,17 +655,14 @@ srv_t_smq <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_summary.R b/R/tm_t_summary.R index d27ea38601..4eb86e1669 100644 --- a/R/tm_t_summary.R +++ b/R/tm_t_summary.R @@ -332,11 +332,7 @@ ui_summary <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -571,17 +567,14 @@ srv_summary <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_summary_by.R b/R/tm_t_summary_by.R index 1156e065fb..a6a23b6ad6 100644 --- a/R/tm_t_summary_by.R +++ b/R/tm_t_summary_by.R @@ -460,11 +460,7 @@ ui_summary_by <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -726,17 +722,14 @@ srv_summary_by <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) diff --git a/R/tm_t_tte.R b/R/tm_t_tte.R index 814464803e..a842506b62 100644 --- a/R/tm_t_tte.R +++ b/R/tm_t_tte.R @@ -515,11 +515,7 @@ ui_t_tte <- function(id, ...) { output = teal.widgets::white_small_well(teal.widgets::table_with_settings_ui(ns("table"))), encoding = shiny::div( ### Reporter - shiny::tags$div( - teal.reporter::add_card_button_ui(ns("addReportCard")), - teal.reporter::download_report_button_ui(ns("downloadButton")), - teal.reporter::reset_report_button_ui(ns("resetButton")) - ), + teal.reporter::simple_reporter_ui(ns("simple_reporter")), shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), @@ -903,17 +899,14 @@ srv_t_tte <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = "" ), collapse = "\n")) card } - - teal.reporter::add_card_button_srv("addReportCard", reporter = reporter, card_fun = card_fun) - teal.reporter::download_report_button_srv("downloadButton", reporter = reporter) - teal.reporter::reset_report_button_srv("resetButton", reporter) + teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun) } ### }) From fe6dffaf4f5932023899c5f9873c5abc9080426a Mon Sep 17 00:00:00 2001 From: Mahmoud Hallal Date: Mon, 25 Jul 2022 09:54:37 +0200 Subject: [PATCH 3/4] remove space --- R/tm_a_mmrm.R | 1 - R/tm_g_barchart_simple.R | 1 - R/tm_g_ci.R | 1 - R/tm_g_forest_rsp.R | 1 - R/tm_g_forest_tte.R | 1 - R/tm_g_ipp.R | 1 - R/tm_g_km.R | 1 - R/tm_g_lineplot.R | 1 - R/tm_g_pp_adverse_events.R | 1 - R/tm_g_pp_patient_timeline.R | 1 - R/tm_g_pp_therapy.R | 1 - R/tm_g_pp_vitals.R | 1 - R/tm_t_abnormality.R | 1 - R/tm_t_abnormality_by_worst_grade.R | 1 - R/tm_t_ancova.R | 1 - R/tm_t_binary_outcome.R | 1 - R/tm_t_coxreg.R | 1 - R/tm_t_events.R | 1 - R/tm_t_events_by_grade.R | 1 - R/tm_t_events_patyear.R | 1 - R/tm_t_events_summary.R | 1 - R/tm_t_exposure.R | 1 - R/tm_t_logistic.R | 1 - R/tm_t_mult_events.R | 1 - R/tm_t_pp_basic_info.R | 1 - R/tm_t_pp_laboratory.R | 1 - R/tm_t_pp_medical_history.R | 1 - R/tm_t_pp_prior_medication.R | 1 - R/tm_t_shift_by_arm.R | 1 - R/tm_t_shift_by_arm_by_worst.R | 1 - R/tm_t_shift_by_grade.R | 1 - R/tm_t_smq.R | 1 - R/tm_t_summary.R | 1 - R/tm_t_summary_by.R | 1 - R/tm_t_tte.R | 1 - 35 files changed, 35 deletions(-) diff --git a/R/tm_a_mmrm.R b/R/tm_a_mmrm.R index 1690aeb6cb..d7293448d6 100644 --- a/R/tm_a_mmrm.R +++ b/R/tm_a_mmrm.R @@ -596,7 +596,6 @@ ui_mmrm <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "id_var", "visit_var", "cov_var", "aval_var")]), diff --git a/R/tm_g_barchart_simple.R b/R/tm_g_barchart_simple.R index 0d207ede9b..7a3a5c6d3c 100644 --- a/R/tm_g_barchart_simple.R +++ b/R/tm_g_barchart_simple.R @@ -208,7 +208,6 @@ ui_g_barchart_simple <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(args[c("x", "fill", "x_facet", "y_facet")]), diff --git a/R/tm_g_ci.R b/R/tm_g_ci.R index ec46612eda..35727a9a1f 100644 --- a/R/tm_g_ci.R +++ b/R/tm_g_ci.R @@ -315,7 +315,6 @@ ui_g_ci <- function(id, ...) { # nolint encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(args[c("x_var", "y_var", "color")]), diff --git a/R/tm_g_forest_rsp.R b/R/tm_g_forest_rsp.R index b9e6fd4302..3aabe955c3 100644 --- a/R/tm_g_forest_rsp.R +++ b/R/tm_g_forest_rsp.R @@ -385,7 +385,6 @@ ui_g_forest_rsp <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "aval_var", "subgroup_var", "strata_var")]), diff --git a/R/tm_g_forest_tte.R b/R/tm_g_forest_tte.R index 29885a79bc..4d4cbb7851 100644 --- a/R/tm_g_forest_tte.R +++ b/R/tm_g_forest_tte.R @@ -371,7 +371,6 @@ ui_g_forest_tte <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "subgroup_var", "strata_var", "aval_var", "cnsr_var")]), diff --git a/R/tm_g_ipp.R b/R/tm_g_ipp.R index 66fe44ce4b..970094a189 100644 --- a/R/tm_g_ipp.R +++ b/R/tm_g_ipp.R @@ -370,7 +370,6 @@ ui_g_ipp <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_g_km.R b/R/tm_g_km.R index 6a921d1028..1a36dcad7c 100644 --- a/R/tm_g_km.R +++ b/R/tm_g_km.R @@ -421,7 +421,6 @@ ui_g_km <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "strata_var", "facet_var", "aval_var", "cnsr_var")]), diff --git a/R/tm_g_lineplot.R b/R/tm_g_lineplot.R index 5aa522380b..b704745d1b 100644 --- a/R/tm_g_lineplot.R +++ b/R/tm_g_lineplot.R @@ -357,7 +357,6 @@ ui_g_lineplot <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("strata", "paramcd", "x", "y", "y_unit", "param")]), diff --git a/R/tm_g_pp_adverse_events.R b/R/tm_g_pp_adverse_events.R index 9b39f8568e..97993e5cb3 100644 --- a/R/tm_g_pp_adverse_events.R +++ b/R/tm_g_pp_adverse_events.R @@ -319,7 +319,6 @@ ui_g_adverse_events <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c( diff --git a/R/tm_g_pp_patient_timeline.R b/R/tm_g_pp_patient_timeline.R index 47a0be95f4..01e04057f5 100644 --- a/R/tm_g_pp_patient_timeline.R +++ b/R/tm_g_pp_patient_timeline.R @@ -573,7 +573,6 @@ ui_g_patient_timeline <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_g_pp_therapy.R b/R/tm_g_pp_therapy.R index ac00063515..426d5ef636 100644 --- a/R/tm_g_pp_therapy.R +++ b/R/tm_g_pp_therapy.R @@ -454,7 +454,6 @@ ui_g_therapy <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c( diff --git a/R/tm_g_pp_vitals.R b/R/tm_g_pp_vitals.R index 734cbc564d..6e95d202f3 100644 --- a/R/tm_g_pp_vitals.R +++ b/R/tm_g_pp_vitals.R @@ -309,7 +309,6 @@ ui_g_vitals <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c("paramcd", "param", "aval", "xaxis")]), diff --git a/R/tm_t_abnormality.R b/R/tm_t_abnormality.R index 70a6a0bbf4..8645728183 100644 --- a/R/tm_t_abnormality.R +++ b/R/tm_t_abnormality.R @@ -394,7 +394,6 @@ ui_t_abnormality <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_t_abnormality_by_worst_grade.R b/R/tm_t_abnormality_by_worst_grade.R index ec8635cb04..777726cffe 100644 --- a/R/tm_t_abnormality_by_worst_grade.R +++ b/R/tm_t_abnormality_by_worst_grade.R @@ -379,7 +379,6 @@ ui_t_abnormality_by_worst_grade <- function(id, ...) { # nolint encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_t_ancova.R b/R/tm_t_ancova.R index 02fbecb25d..c72cf5ee20 100644 --- a/R/tm_t_ancova.R +++ b/R/tm_t_ancova.R @@ -455,7 +455,6 @@ ui_ancova <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "aval_var", "cov_var", "avisit", "paramcd")]), diff --git a/R/tm_t_binary_outcome.R b/R/tm_t_binary_outcome.R index 17f1d85701..611607c141 100644 --- a/R/tm_t_binary_outcome.R +++ b/R/tm_t_binary_outcome.R @@ -540,7 +540,6 @@ ui_t_binary_outcome <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("paramcd", "arm_var", "aval_var", "strata_var")]), diff --git a/R/tm_t_coxreg.R b/R/tm_t_coxreg.R index 09f9b43295..f8df72445f 100644 --- a/R/tm_t_coxreg.R +++ b/R/tm_t_coxreg.R @@ -580,7 +580,6 @@ ui_t_coxreg <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::radioButtons( ns("type"), diff --git a/R/tm_t_events.R b/R/tm_t_events.R index eca1eb7f57..f2eeec2d9b 100644 --- a/R/tm_t_events.R +++ b/R/tm_t_events.R @@ -553,7 +553,6 @@ ui_t_events_byterm <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "hlt", "llt")]), diff --git a/R/tm_t_events_by_grade.R b/R/tm_t_events_by_grade.R index 7a57cc1b43..e1d4e5e91c 100644 --- a/R/tm_t_events_by_grade.R +++ b/R/tm_t_events_by_grade.R @@ -891,7 +891,6 @@ ui_t_events_by_grade <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "hlt", "llt", "grade")]), diff --git a/R/tm_t_events_patyear.R b/R/tm_t_events_patyear.R index 2dbc121432..9b537fed35 100644 --- a/R/tm_t_events_patyear.R +++ b/R/tm_t_events_patyear.R @@ -267,7 +267,6 @@ ui_events_patyear <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "aval_var", "avalu_var", "events_var")]), diff --git a/R/tm_t_events_summary.R b/R/tm_t_events_summary.R index 273f38fd5e..fc92382ab3 100644 --- a/R/tm_t_events_summary.R +++ b/R/tm_t_events_summary.R @@ -708,7 +708,6 @@ ui_t_events_summary <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_t_exposure.R b/R/tm_t_exposure.R index e104f3d18b..c14d741001 100644 --- a/R/tm_t_exposure.R +++ b/R/tm_t_exposure.R @@ -399,7 +399,6 @@ ui_t_exposure <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c( diff --git a/R/tm_t_logistic.R b/R/tm_t_logistic.R index 5f0fcbd05d..1afecd33c0 100644 --- a/R/tm_t_logistic.R +++ b/R/tm_t_logistic.R @@ -364,7 +364,6 @@ ui_t_logistic <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "paramcd", "avalc_var", "cov_var")]), diff --git a/R/tm_t_mult_events.R b/R/tm_t_mult_events.R index 58cc750349..3e3fb8a101 100644 --- a/R/tm_t_mult_events.R +++ b/R/tm_t_mult_events.R @@ -386,7 +386,6 @@ ui_t_mult_events_byterm <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "seq_var", "hlt", "llt")]), diff --git a/R/tm_t_pp_basic_info.R b/R/tm_t_pp_basic_info.R index 50734d7927..cf710fc2ec 100644 --- a/R/tm_t_pp_basic_info.R +++ b/R/tm_t_pp_basic_info.R @@ -127,7 +127,6 @@ ui_t_basic_info <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c("vars")]), diff --git a/R/tm_t_pp_laboratory.R b/R/tm_t_pp_laboratory.R index f7bac35a1b..072ac90b57 100644 --- a/R/tm_t_pp_laboratory.R +++ b/R/tm_t_pp_laboratory.R @@ -222,7 +222,6 @@ ui_g_laboratory <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c("timepoints", "aval", "avalu", "param", "paramcd", "anrind")]), diff --git a/R/tm_t_pp_medical_history.R b/R/tm_t_pp_medical_history.R index e2b0124288..ffc3a1931d 100644 --- a/R/tm_t_pp_medical_history.R +++ b/R/tm_t_pp_medical_history.R @@ -182,7 +182,6 @@ ui_t_medical_history <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c("mhterm", "mhbodsys", "mhdistat")]), diff --git a/R/tm_t_pp_prior_medication.R b/R/tm_t_pp_prior_medication.R index bc1b75f3d6..3a5ba90fd0 100644 --- a/R/tm_t_pp_prior_medication.R +++ b/R/tm_t_pp_prior_medication.R @@ -208,7 +208,6 @@ ui_t_prior_medication <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(ui_args[c("atirel", "cmdecod", "cmindc", "cmstdy")]), diff --git a/R/tm_t_shift_by_arm.R b/R/tm_t_shift_by_arm.R index f648695d3e..0acc0d3534 100644 --- a/R/tm_t_shift_by_arm.R +++ b/R/tm_t_shift_by_arm.R @@ -300,7 +300,6 @@ ui_shift_by_arm <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c( diff --git a/R/tm_t_shift_by_arm_by_worst.R b/R/tm_t_shift_by_arm_by_worst.R index 4ff97cb035..3d368feeb9 100644 --- a/R/tm_t_shift_by_arm_by_worst.R +++ b/R/tm_t_shift_by_arm_by_worst.R @@ -311,7 +311,6 @@ ui_shift_by_arm_by_worst <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c( diff --git a/R/tm_t_shift_by_grade.R b/R/tm_t_shift_by_grade.R index af5e31958d..e0c0306c2e 100644 --- a/R/tm_t_shift_by_grade.R +++ b/R/tm_t_shift_by_grade.R @@ -638,7 +638,6 @@ ui_t_shift_by_grade <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( diff --git a/R/tm_t_smq.R b/R/tm_t_smq.R index 48e9355512..44d34e9fa1 100644 --- a/R/tm_t_smq.R +++ b/R/tm_t_smq.R @@ -451,7 +451,6 @@ ui_t_smq <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c( diff --git a/R/tm_t_summary.R b/R/tm_t_summary.R index 4eb86e1669..a33e5f7b34 100644 --- a/R/tm_t_summary.R +++ b/R/tm_t_summary.R @@ -333,7 +333,6 @@ ui_summary <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "summarize_vars")]), diff --git a/R/tm_t_summary_by.R b/R/tm_t_summary_by.R index a6a23b6ad6..a58463342f 100644 --- a/R/tm_t_summary_by.R +++ b/R/tm_t_summary_by.R @@ -461,7 +461,6 @@ ui_summary_by <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input(a[c("arm_var", "id_var", "paramcd", "by_vars", "summarize_vars")]), diff --git a/R/tm_t_tte.R b/R/tm_t_tte.R index a842506b62..750f5a18aa 100644 --- a/R/tm_t_tte.R +++ b/R/tm_t_tte.R @@ -516,7 +516,6 @@ ui_t_tte <- function(id, ...) { encoding = shiny::div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), - shiny::tags$br(), ### shiny::tags$label("Encodings", class = "text-primary"), teal.transform::datanames_input( From 3cb8fb434bfa1bf8006203a70d40ad7b36b010c0 Mon Sep 17 00:00:00 2001 From: Nikolas Burkoff Date: Tue, 26 Jul 2022 11:10:46 +0100 Subject: [PATCH 4/4] Update R/tm_a_mmrm.R --- R/tm_a_mmrm.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/tm_a_mmrm.R b/R/tm_a_mmrm.R index d7293448d6..e2310ac112 100644 --- a/R/tm_a_mmrm.R +++ b/R/tm_a_mmrm.R @@ -1433,7 +1433,7 @@ srv_mmrm <- function(id, card$append_text(comment) } card$append_src(paste(get_rcode( - chunks = teal.code::get_chunks_object(parent_idx = 1L), + chunks = teal.code::get_chunks_object(parent_idx = 2L), datasets = datasets, title = "", description = ""