Skip to content

Commit

Permalink
Merge branch 'main' into register_handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelru authored Mar 20, 2024
2 parents 45bbc0b + cfdc314 commit d53c25a
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: teal.osprey
Title: 'teal' Modules for TLG Functions in Osprey
Version: 0.1.16.9013
Date: 2024-03-14
Version: 0.1.16.9014
Date: 2024-03-15
Authors@R: c(
person("Nina", "Qi", , "[email protected]", role = c("aut", "cre")),
person("Dawid", "Kaledkowski", , "[email protected]", role = "aut"),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# teal.osprey 0.1.16.9013
# teal.osprey 0.1.16.9014

### Breaking Changes
* Adapted all modules to use `teal_data` objects.
Expand Down
2 changes: 1 addition & 1 deletion R/tm_g_ae_oview.R
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ui_g_ae_oview <- function(id, ...) {
output = teal.widgets::white_small_well(
plot_decorate_output(id = ns(NULL))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down
2 changes: 1 addition & 1 deletion R/tm_g_ae_sub.R
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ ui_g_ae_sub <- function(id, ...) {
output = teal.widgets::white_small_well(
plot_decorate_output(id = ns(NULL))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down
2 changes: 1 addition & 1 deletion R/tm_g_butterfly.R
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ ui_g_butterfly <- function(id, ...) {
output = teal.widgets::white_small_well(
teal.widgets::plot_with_settings_ui(id = ns("butterflyplot"))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down
2 changes: 1 addition & 1 deletion R/tm_g_events_term_id.R
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ui_g_events_term_id <- function(id, ...) {
output = teal.widgets::white_small_well(
plot_decorate_output(id = ns(NULL))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down
4 changes: 2 additions & 2 deletions R/tm_g_heat_bygrade.R
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ ui_g_heatmap_bygrade <- function(id, ...) {
output = teal.widgets::white_small_well(
plot_decorate_output(id = ns(NULL))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down Expand Up @@ -234,7 +234,7 @@ ui_g_heatmap_bygrade <- function(id, ...) {
multiple = FALSE
),
helpText("Plot conmed"),
div(
tags$div(
class = "pretty-left-border",
if (!is.na(args$cm_dataname)) {
checkboxInput(
Expand Down
6 changes: 3 additions & 3 deletions R/tm_g_patient_profile.R
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ ui_g_patient_profile <- function(id, ...) {
output = teal.widgets::white_small_well(
teal.widgets::plot_with_settings_ui(id = ns("patientprofileplot"))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand All @@ -228,7 +228,7 @@ ui_g_patient_profile <- function(id, ...) {
choices = a$patient_id$choices,
selected = a$patient_id$selected
),
div(
tags$div(
tagList(
helpText("Select", tags$code("ADaM"), "Domains"),
checkboxGroupInput(
Expand Down Expand Up @@ -320,7 +320,7 @@ ui_g_patient_profile <- function(id, ...) {
),
textInput(
ns("x_limit"),
label = div(
label = tags$div(
"Study Days Range",
tags$br(),
helpText("Enter TWO numeric values of study days range, separated by comma (eg. -28, 750)")
Expand Down
8 changes: 4 additions & 4 deletions R/tm_g_spiderplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ ui_g_spider <- function(id, ...) {
output = teal.widgets::white_small_well(
teal.widgets::plot_with_settings_ui(id = ns("spiderplot"))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
tags$label("Encodings", class = "text-primary"),
helpText("Analysis data:", tags$code(a$dataname)),
div(
tags$div(
class = "pretty-left-border",
teal.widgets::optionalSelectInput(
ns("paramcd"),
Expand Down Expand Up @@ -210,7 +210,7 @@ ui_g_spider <- function(id, ...) {
),
textInput(
ns("vref_line"),
label = div(
label = tags$div(
"Vertical Reference Line(s)",
tags$br(),
helpText("Enter numeric value(s) of vertical reference lines, separated by comma (eg. -2, 1)")
Expand All @@ -219,7 +219,7 @@ ui_g_spider <- function(id, ...) {
),
textInput(
ns("href_line"),
label = div(
label = tags$div(
"Hortizontal Reference Line(s)",
tags$br(),
helpText("Enter numeric value(s) of horizontal reference lines, separated by comma (eg. -2, 1)")
Expand Down
24 changes: 12 additions & 12 deletions R/tm_g_swimlane.R
Original file line number Diff line number Diff line change
Expand Up @@ -180,29 +180,29 @@ ui_g_swimlane <- function(id, ...) {
output = teal.widgets::white_small_well(
teal.widgets::plot_with_settings_ui(id = ns("swimlaneplot"))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
tags$label("Encodings", class = "text-primary"),
helpText("Analysis data:", code(a$dataname)),
div(
helpText("Analysis data:", tags$code(a$dataname)),
tags$div(
class = "pretty-left-border",
teal.widgets::optionalSelectInput(
ns("bar_var"),
"Bar Length",
choices = a$bar_var$choices,
selected = a$bar_var$selected,
multiple = FALSE,
label_help = helpText("from ", code("ADSL"))
label_help = helpText("from ", tags$code("ADSL"))
),
teal.widgets::optionalSelectInput(
ns("bar_color_var"),
"Bar Color",
choices = a$bar_color_var$choices,
selected = a$bar_color_var$selected,
multiple = FALSE,
label_help = helpText("from ", code("ADSL"))
label_help = helpText("from ", tags$code("ADSL"))
)
),
teal.widgets::optionalSelectInput(
Expand All @@ -211,9 +211,9 @@ ui_g_swimlane <- function(id, ...) {
choices = a$sort_var$choices,
selected = a$sort_var$selected,
multiple = FALSE,
label_help = helpText("from ", code("ADSL"))
label_help = helpText("from ", tags$code("ADSL"))
),
div(
tags$div(
class = "pretty-left-border",
if (a$dataname == "ADSL") {
NULL
Expand All @@ -226,7 +226,7 @@ ui_g_swimlane <- function(id, ...) {
choices = a$marker_pos_var$choices,
selected = a$marker_pos_var$selected,
multiple = FALSE,
label_help = helpText("from ", code(a$dataname))
label_help = helpText("from ", tags$code(a$dataname))
)
},
uiOutput(ns("marker_shape_sel")),
Expand All @@ -238,11 +238,11 @@ ui_g_swimlane <- function(id, ...) {
choices = a$anno_txt_var$choices,
selected = a$anno_txt_var$selected,
multiple = TRUE,
label_help = helpText("from ", code("ADSL"))
label_help = helpText("from ", tags$code("ADSL"))
),
textInput(
ns("vref_line"),
label = div(
label = tags$div(
"Vertical Reference Line(s)",
tags$br(),
helpText("Enter numeric value(s) of reference lines, separated by comma (eg. 100, 200)")
Expand Down Expand Up @@ -303,7 +303,7 @@ srv_g_swimlane <- function(id,
ns("marker_shape_var"), "Marker Shape",
choices = marker_shape_var$choices,
selected = marker_shape_var$selected, multiple = FALSE,
label_help = helpText("from ", code(dataname))
label_help = helpText("from ", tags$code(dataname))
)
}
})
Expand All @@ -316,7 +316,7 @@ srv_g_swimlane <- function(id,
ns("marker_color_var"), "Marker Color",
choices = marker_color_var$choices,
selected = marker_color_var$selected, multiple = FALSE,
label_help = helpText("from ", code(dataname))
label_help = helpText("from ", tags$code(dataname))
)
}
})
Expand Down
8 changes: 4 additions & 4 deletions R/tm_g_waterfall.R
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ ui_g_waterfall <- function(id, ...) {
output = teal.widgets::white_small_well(
teal.widgets::plot_with_settings_ui(id = ns("waterfallplot"))
),
encoding = div(
encoding = tags$div(
### Reporter
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
###
Expand Down Expand Up @@ -237,7 +237,7 @@ ui_g_waterfall <- function(id, ...) {
),
textInput(
ns("href_line"),
label = div(
label = tags$div(
"Horizontal Reference Line(s)",
tags$br(),
helpText("Enter numeric value(s) of reference lines, separated by comma (eg. -10, 20)")
Expand All @@ -246,7 +246,7 @@ ui_g_waterfall <- function(id, ...) {
),
textInput(
ns("ytick_at"),
label = div(
label = tags$div(
"Y-axis Interval",
tags$br(),
helpText("Enter a numeric value of Y axis interval")
Expand All @@ -255,7 +255,7 @@ ui_g_waterfall <- function(id, ...) {
),
textInput(
ns("gap_point_val"),
label = div(
label = tags$div(
"Break High Bars",
tags$br(),
helpText("Enter a numeric value to break very high bars")
Expand Down

0 comments on commit d53c25a

Please sign in to comment.