Merge branch 'ui-phase2' of https://github.com/pfizer-opensource/carver…

… into ui-phase2
pfizer-opensource · Sep 23, 2024 · da7c701 · da7c701
2 parents 84cf453 + 69aae53
commit da7c701
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/R/edish_plot.R b/R/edish_plot.R
@@ -1,4 +1,3 @@
-
 #' Process data for eDISH plot
 #'
 #' @param datain Input dataset.
@@ -47,7 +46,7 @@ process_edish_data <- function(datain,
     "Please provide valid PARAMCD" =
       all(c(alt_paramcd, ast_paramcd, bili_paramcd) %in% datain$PARAMCD)
   )
-  
+
   hy_data <- datain |>
     filter(.data$PARAMCD %in% c(alt_paramcd, ast_paramcd, bili_paramcd)) |>
     mutate(maxv = .data$AVAL / .data$ANRHI) |>
@@ -58,7 +57,7 @@ process_edish_data <- function(datain,
         TRUE ~ "bili"
       )
     )
-  
+
   hy <- hy_data |>
     group_by(across(all_of(c("USUBJID", "TRTVAR", "PARAMCD", "PARAM", "PARM")))) |>
     summarise(x = max(.data$maxv)) |>
@@ -67,21 +66,21 @@ process_edish_data <- function(datain,
       names_from = PARM,
       values_from = x
     )
-  
+
   if (xvar %in% c("alt", "ast")) {
     hy <- hy |> mutate(XVAR = .data[[xvar]])
   } else {
     hy <- hy |> mutate(XVAR = pmax(.data$ast, .data$alt))
   }
-  
+
   hy |>
     mutate(
       text = paste0(
         "Subjid = ",
         USUBJID,
         "\n",
         ifelse(xvar == "both", "Max of ALT/AST = ",
-               paste("value of", toupper(xvar), "=")
+          paste("value of", toupper(xvar), "=")
         ),
         round(XVAR, 3),
         "\n",
@@ -198,7 +197,7 @@ edish_plot <- function(datain,
                        ),
                        interactive = "N") {
   stopifnot(is.data.frame(datain))
-  
+
   ### Modified  plot options ####
   if (length(axis_opts$Xbrks) > 0 && length(axis_opts$Xlims) > 0) {
     axis_opts$Xlims[2] <- max(ceiling(max(datain$XVAR)), axis_opts$Xlims)
@@ -207,7 +206,7 @@ edish_plot <- function(datain,
       max(axis_opts$Xbrks)
     )
   }
-  
+
   if (length(axis_opts$Ybrks) > 0 && length(axis_opts$Ylims) > 0) {
     axis_opts$Ylims[2] <- max(ceiling(max(datain$XVAR)), axis_opts$Ylims)
     axis_opts$Ybrks[which.max(axis_opts$Ybrks)] <- min(
@@ -229,9 +228,9 @@ edish_plot <- function(datain,
     max(as.numeric(yrefline[1]), max(axis_opts$Ybrks)),
     as.numeric(yrefline[1]) - 0.2
   )
-  
+
   # for ploting values per subject
-  
+
   sp <- datain |>
     scatter_plot(
       axis_opts = axis_opts,
@@ -287,7 +286,7 @@ edish_plot <- function(datain,
       y = quad_labels_opts_y[4],
       label = quad_labels[4]
     )
-  
+
   # ggplotly if interactive
   if (interactive == "Y") {
     sp <- as_plotly(plot = sp, hover = c("text"))

diff --git a/R/mod_generic_filters.R b/R/mod_generic_filters.R
@@ -306,7 +306,7 @@ mod_generic_filters_server <-
           choices = pct_denom
         )
       })
-      
+
       observe({
         req(domain())
         if (repName() == "eDISH_plot") {
@@ -690,7 +690,7 @@ mod_generic_filters_server <-
           input$treatment1, input$treatment2, input$pctdisp, input$denom_subset,
           input$trtbign, input$ae_hlt
         ))
-      
+
       observe({
         req(sourcedata())
         req(domain())
@@ -705,7 +705,7 @@ mod_generic_filters_server <-
         merged_df <- sourcedata()$adsl %>%
           adsl_merge(
             dataset_add = filter(sourcedata()$adlb, !!!rlang::parse_exprs(input$a_subset))
-            ) %>%
+          ) %>%
           mentry(
             subset = input$overall_subset,
             byvar = NA_character_,