Skip to content

Commit

Permalink
Merge pull request #111 from pharmaverse/97-bug-duplicated-input-id-f…
Browse files Browse the repository at this point in the history 
…or-submit_tlg_order

97 bug duplicated input id for submit tlg order
  • Loading branch information
@Gotfrid
Gotfrid authored Nov 15, 2024
2 parents 04adf81 + d5d0187 commit 828a45d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
4 changes: 2 additions & 2 deletions inst/shiny/modules/tab_tlg.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tab_tlg_ui <- function(id) {
actionButton(ns("remove_tlg"), "Remove TLG"),
actionButton(ns("submit_tlg_order"), "Submit Order Details"),
DTOutput(ns("selected_tlg_table")),
actionButton(ns("submit_tlg_order"), "Submit Order Details")
actionButton(ns("submit_tlg_order_alt"), "Submit Order Details")
),
tabPanel(
"Tables",
Expand Down Expand Up @@ -239,7 +239,7 @@ tab_tlg_server <- function(id, data) {
})

# When the user submits the TLG order...
observeEvent(input$submit_tlg_order, {
observeEvent(list(input$submit_tlg_order, input$submit_tlg_order_alt), {
tlg_order_filt <- tlg_order()[tlg_order()$Selection, ]

if (sum(tlg_order_filt$Type == "Table") > 0) {
Expand Down
28 changes: 15 additions & 13 deletions inst/shiny/tabs/nca.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,39 +135,39 @@ observeEvent(input$settings_upload, {

# RSADJ
if (!is.na(setts$adj.r.squared_threshold[1])) {
updateCheckboxInput(session, inputId = "rule_adj.r.squared", label = "RSQADJ:", value = TRUE)
updateCheckboxInput(session, inputId = "rule_adj_r_squared", label = "RSQADJ:", value = TRUE)
updateNumericInput(
session,
"adj.r.squared_threshold",
"",
value = setts$adj.r.squared_threshold[1]
)
} else {
updateCheckboxInput(session, inputId = "rule_adj.r.squared", label = "RSQADJ:", value = FALSE)
updateCheckboxInput(session, inputId = "rule_adj_r_squared", label = "RSQADJ:", value = FALSE)
}

# AUCPE.Obs
if (!is.na(setts$aucpext.obs_threshold[1])) {
updateCheckboxInput(session, inputId = "rule_aucpext.obs", value = TRUE)
updateCheckboxInput(session, inputId = "rule_aucpext_obs", value = TRUE)
updateNumericInput(session, "aucpext.obs_threshold", value = setts$aucpext.obs_threshold[1])
} else {
updateCheckboxInput(session, inputId = "rule_aucpext.obs", label = "", value = FALSE)
updateCheckboxInput(session, inputId = "rule_aucpext_obs", label = "", value = FALSE)
}

# AUCPE.Pred
if (!is.na(setts$aucpext.pred_threshold[1])) {
updateCheckboxInput(session, inputId = "rule_aucpext.pred", value = TRUE)
updateCheckboxInput(session, inputId = "rule_aucpext_pred", value = TRUE)
updateNumericInput(session, "aucpext.pred_threshold", value = setts$aucpext.pred_threshold[1])
} else {
updateCheckboxInput(session, inputId = "rule_aucpext.pred", value = FALSE)
updateCheckboxInput(session, inputId = "rule_aucpext_pred", value = FALSE)
}

# SPAN
if (!is.na(setts$span.ratio_threshold[1])) {
updateCheckboxInput(session, inputId = "rule_span.ratio", label = "SPAN: ", value = TRUE)
updateCheckboxInput(session, inputId = "rule_span_ratio", label = "SPAN: ", value = TRUE)
updateNumericInput(session, "span.ratio_threshold", "", value = setts$span.ratio_threshold[1])
} else {
updateCheckboxInput(session, inputId = "rule_span.ratio", label = "SPAN:", value = FALSE)
updateCheckboxInput(session, inputId = "rule_span_ratio", label = "SPAN:", value = FALSE)
}
})

Expand Down Expand Up @@ -447,7 +447,9 @@ observeEvent(res_nca(), {
for (rule_input in grep("^rule_", names(input), value = TRUE)) {
if (!input[[rule_input]]) next

pptestcd <- gsub("rule_", "", rule_input)
pptestcd <- rule_input |>
gsub("^rule_", "", x = _) |>
gsub("_", ".", x = _, fixed = TRUE)
if (startsWith(pptestcd, "auc")) {
final_res_nca[[paste0("flag_", pptestcd)]] <- {
final_res_nca[[pptestcd]] >= input[[paste0(pptestcd, "_threshold")]]
Expand Down Expand Up @@ -609,16 +611,16 @@ output$settings_save <- downloadHandler(
),
method = input$method,
adj.r.squared_threshold = ifelse(
input$rule_adj.r.squared, input$adj.r.squared_threshold, NA
input$rule_adj_r_squared, input$adj.r.squared_threshold, NA
),
aucpext.obs_threshold = ifelse(
input$rule_aucpext.obs, input$aucpext.obs_threshold, NA
input$rule_aucpext_obs, input$aucpext.obs_threshold, NA
),
aucpext.pred_threshold = ifelse(
input$rule_aucpext.pred, input$aucpext.pred_threshold, NA
input$rule_aucpext_pred, input$aucpext.pred_threshold, NA
),
span.ratio_threshold = ifelse(
input$rule_span.ratio, input$span.ratio_threshold, NA
input$rule_span_ratio, input$span.ratio_threshold, NA
),
auc_mins = if (is.null(auc_mins)) NA else paste(auc_mins, collapse = ","),
auc_maxs = if (is.null(auc_maxs)) NA else paste(auc_maxs, collapse = ",")
Expand Down
16 changes: 8 additions & 8 deletions inst/shiny/ui.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ fluidPage(
fluidRow(
column(
width = 6,
checkboxInput("rule_adj.r.squared", "RSQADJ:")
checkboxInput("rule_adj_r_squared", "RSQADJ:")
),
column(
width = 6,
conditionalPanel(
condition = "input.rule_adj.r.squared == true",
condition = "input.rule_adj_r_squared == true",
div(
style = "display: flex; align-items: center;",
span(">=", style = "margin-right: 5px;"),
Expand All @@ -106,12 +106,12 @@ fluidPage(
fluidRow(
column(
width = 6,
checkboxInput("rule_aucpext.obs", "AUCPEO (% ext.observed): ")
checkboxInput("rule_aucpext_obs", "AUCPEO (% ext.observed): ")
),
column(
width = 6,
conditionalPanel(
condition = "input.rule_aucpext.obs == true",
condition = "input.rule_aucpext_obs == true",
div(
style = "display: flex; align-items: center;",
span(">=", style = "margin-right: 5px;"),
Expand All @@ -130,12 +130,12 @@ fluidPage(
fluidRow(
column(
width = 6,
checkboxInput("rule_aucpext.pred", "AUCPEP (% ext.predicted): "),
checkboxInput("rule_aucpext_pred", "AUCPEP (% ext.predicted): "),
),
column(
width = 6,
conditionalPanel(
condition = "input.rule_aucpext.pred == true",
condition = "input.rule_aucpext_pred == true",
div(
style = "display: flex; align-items: center;",
span(">=", style = "margin-right: 5px;"),
Expand All @@ -154,12 +154,12 @@ fluidPage(
fluidRow(
column(
width = 6,
checkboxInput("rule_span.ratio", "SPAN: "),
checkboxInput("rule_span_ratio", "SPAN: "),
),
column(
width = 6,
conditionalPanel(
condition = "input.rule_span.ratio == true",
condition = "input.rule_span_ratio == true",
div(
style = "display: flex; align-items: center;",
span(">=", style = "margin-right: 5px;"),
Expand Down

0 comments on commit 828a45d

Please sign in to comment.