Update app.R

app.R

@@ -2045,28 +2045,103 @@ catcher_create_throwing_plot <- function(catcher_data, catcher_name) {
 }
 
 catcher_create_simple_header <- function(catcher_name, game_date, bio_data = NULL) {
+
+  suppressPackageStartupMessages({
+    library(grid)
+    library(gridExtra)
+    library(magick)
+    library(dplyr)
+  })
+
+  title_text   <- paste(catcher_name, "- Catcher Report")
+  subhead_text <- if (!is.na(game_date)) paste("Game Date:", game_date) else NULL
+
+  ## ---------------- HEADSHOT HEADER (IF AVAILABLE) ----------------
   if (!is.null(bio_data) && nrow(bio_data) > 0) {
+
     catcher_bio <- bio_data %>% filter(Catcher == catcher_name)
+
     if (nrow(catcher_bio) > 0 && "Headshot" %in% names(catcher_bio)) {
+
       headshot_url <- catcher_bio$Headshot[1]
+
       if (!is.na(headshot_url) && nzchar(headshot_url)) {
-        tryCatch({
-          if (requireNamespace("magick", quietly = TRUE)) {
-            img <- magick::image_read(headshot_url)
-            img_grob <- rasterGrob(as.raster(img), interpolate = TRUE)
-            text_grob <- textGrob(paste(catcher_name, "- Catcher Report"),
-                                  gp = gpar(fontface = "bold", cex = 1.6, col = "#006F71"))
-            return(arrangeGrob(img_grob, text_grob, ncol = 2,
-                               widths = unit.c(unit(100, "pt"), unit(1, "null"))))
-          }
-        }, error = function(e) { })
+
+        img <- try(magick::image_read(headshot_url), silent = TRUE)
+
+        if (!inherits(img, "try-error")) {
+
+          img_grob <- rasterGrob(as.raster(img), interpolate = TRUE)
+
+          text_grob <- textGrob(
+            title_text,
+            gp = gpar(fontface = "bold", fontsize = 18, col = "#006F71"),
+            just = "left"
+          )
+
+          return(
+            arrangeGrob(
+              img_grob,
+              text_grob,
+              ncol = 2,
+              widths = unit.c(unit(100, "pt"), unit(1, "null"))
+            )
+          )
+        }
       }
     }
   }
-  grid::textGrob(paste(catcher_name, "- Catcher Report"),
-                 gp = grid::gpar(fontface = "bold", cex = 1.8, col = "#006F71"))
+
+  ## ---------------- FALLBACK HEADER (NO HEADSHOT) ----------------
+  grid.newpage()
+
+  draw_logo_url <- function(url, x, just) {
+    img <- try(magick::image_read(url), silent = TRUE)
+    if (inherits(img, "try-error")) return(NULL)
+
+    img <- magick::image_resize(img, "x130")
+
+    grid.draw(
+      rasterGrob(
+        as.raster(img),
+        vp = viewport(
+          x = x,
+          y = 0.96,
+          width = 0.13,
+          height = 0.08,
+          just = c(just, "center")
+        ),
+        interpolate = TRUE
+      )
+    )
+  }
+
+  ## --- LOGOS ---
+  left_logo_url  <- "https://i.ibb.co/gLfTW4Fz/t-GPe-TPu.png"
+  right_logo_url <- "https://i.imgur.com/zjTu3JS.png"
+
+  draw_logo_url(left_logo_url,  0.05, "left")
+  draw_logo_url(right_logo_url, 0.95, "right")
+
+  ## --- TEXT ---
+  grid.text(
+    title_text,
+    y = 0.975,
+    gp = gpar(fontsize = 18, fontface = "bold", col = "#006F71")
+  )
+
+  if (!is.null(subhead_text)) {
+    grid.text(
+      subhead_text,
+      y = 0.945,
+      gp = gpar(fontsize = 11)
+    )
+  }
+
+  invisible(NULL)
 }
 
+
 catcher_create_catcher_pdf <- function(game_df, catcher_name, output_file, bio_data = NULL) {
   if (length(dev.list()) > 0) { try(dev.off(), silent = TRUE) }
   catcher_df <- dplyr::filter(game_df, Catcher == catcher_name)
@@ -2080,7 +2155,7 @@ catcher_create_catcher_pdf <- function(game_df, catcher_name, output_file, bio_d
               .groups = "drop")
   
   opp_receiving_stats <- catcher_df %>%
-    filter(PitcherTeam != "COA_CHA") %>%
+    filter(BatterTeam = "COA_CHA") %>%
     summarise(`Opp Strikes Stolen` = sum(StolenStrike, na.rm = TRUE),
               `Opp Strikes Lost`   = sum(StrikeLost,   na.rm = TRUE),
               `Opp Game +/-`       = sum(StolenStrike, na.rm = TRUE) - sum(StrikeLost, na.rm = TRUE),