Address initial review findings

Author: luffmark

R/helper_functions.R

@@ -429,14 +429,14 @@ generate_plot <- function(dataset,
 
   if (alp_flag) {
     if (norm_ref_type == "ULN") {
-      hover_alp <- sprintf("<br>  ALP/ULN %s (%.3f) %s (%.2f)",
+      hover_alp <- sprintf("<br>&nbsp;&nbsp;ALP/ULN %s (%.3f)<br>&nbsp;&nbsp;%s (%.2f)",
                            ifelse(dataset[[".norm_alp"]] <= 2, "≤ 2", "> 2"),
                            dataset[[".norm_alp"]],
                            ifelse(dataset[[".r_ratio"]] <= 2, "R ≤ 2",
                                   ifelse(dataset[[".r_ratio"]] >= 5, "R ≥ 5", "2 < R < 5")),
                            dataset[[".r_ratio"]])
     } else {
-      hover_alp <- sprintf("<br>  ALP/Baseline %s (%.3f)",
+      hover_alp <- sprintf("<br>&nbsp;&nbsp;ALP/Baseline %s (%.3f)",
                            ifelse(dataset[[".norm_alp"]] <= 2, "≤ 2", "> 2"),
                            dataset[[".norm_alp"]])
     }
@@ -453,12 +453,12 @@ generate_plot <- function(dataset,
     "Subject: ", dataset[[subjectid_var]],
     "<br>Arm: ", dataset[[arm_var]],
     "<br>---<br>", sel_x, ": ", sprintf("%.3f", dataset[[".norm_at"]]),
-    "<br>  Visit: ", dataset[[".visit_at"]],
-    "<br>  Date: ", hover_date_x,
+    "<br>&nbsp;&nbsp;Visit: ", dataset[[".visit_at"]],
+    "<br>&nbsp;&nbsp;Date: ", hover_date_x,
     hover_alp,
     "<br>---<br>", sel_y, ": ", sprintf("%.3f", dataset[[".norm_tbili"]]),
-    "<br>  Visit: ", dataset[[".visit_tbili"]],
-    "<br>  Date: ", hover_date_y,
+    "<br>&nbsp;&nbsp;Visit: ", dataset[[".visit_tbili"]],
+    "<br>&nbsp;&nbsp;Date: ", hover_date_y,
     "<br>---<br>Time between peaks: ", hover_offset
   )
 

R/mock_edish.R

@@ -4,11 +4,19 @@
 #'
 #' @keywords internal
 mock_edish_app <- function() {
-  dm <- pharmaverseadam::adsl
-  lb <- pharmaverseadam::adlb
+  dm <- pharmaverseadam::adsl |> dplyr::mutate(dplyr::across(dplyr::where(is.character), as.factor))
+  lb <- pharmaverseadam::adlb |> dplyr::mutate(dplyr::across(dplyr::where(is.character), as.factor))
 
   mock_edish_UI <- function() { # nolint
-    shiny::fluidPage(edish_UI("edish"))
+    shiny::fluidPage(edish_UI(
+      module_id = "edish",
+      arm_default_vals = "Xanomeline High Dose",
+      at_choices = c("Alanine Aminotransferase", "Aspartate Aminotransferase"),
+      at_default_val = "Alanine Aminotransferase",
+      tbili_choice = "Bilirubin",
+      default_by_visit = FALSE,
+      window_days = NULL
+    ))
   }
 
   mock_edish_server <- function(input, output, session) {
@@ -18,6 +26,9 @@ mock_edish_app <- function() {
         list("dm" = dm, "lb" = lb)
       }),
       baseline_visit_val = "SCREENING 1",
+      at_choices = c("Alanine Aminotransferase", "Aspartate Aminotransferase"),
+      tbili_choice = "Bilirubin",
+      alp_choice = "Alkaline Phosphatase",
       lb_date_var = "ADT"
     )
   }

R/mod_edish.R

@@ -19,8 +19,8 @@ EDISH <- pack_of_constants(
   BY_VISIT_INFO = "Aminotransferase values will be plotted for each visit",
   PLOT_TYPE_ID = "plot_type",
   PLOT_TYPE_LABEL = "Plot type:",
-  PLOT_TYPE_CHOICES = c("\u00d7 ULN (eDISH)" = "ULN",
-                        "\u00d7 Baseline (mDISH)" = "Baseline"),
+  PLOT_TYPE_CHOICES = c("eDISH (\u00d7 ULN)" = "ULN",
+                        "mDISH (\u00d7 Baseline)" = "Baseline"),
   PLOT_ID = "plot",
   WINDOW_DAYS_ID = "window_days",
   WINDOW_DAYS_LABEL = "Max. days between peaks:",
@@ -151,7 +151,8 @@ edish_UI <- function(module_id,
       min = 0,
       max = 100,
       step = 1
-    )
+    ),
+    style = "max-height: 85vh; overflow-y: auto; overflow-x: hidden; padding: 10px;"
   )
 
   ui <- shiny::tagList(