Update app.R

app.R

@@ -2941,6 +2941,37 @@ create_pitcher_pdf <- function(game_df, pitcher_name, output_file, pitch_colors)
   invisible(output_file)
 }
 
+
+  ## --- EMBEDDED LOGO LINKS ---
+  left_logo_url  <- "https://i.imgur.com/zjTu3JS.png"
+  right_logo_url <- "https://i.ibb.co/Q3kFXXd9/8acd1b8a-7920-403a-8e9d-86742634effb.png"
+
+  draw_logo_url(left_logo_url,  0.05, "left")
+  draw_logo_url(right_logo_url, 0.95, "right")
+
+  ## --- HEADER TEXT ---
+  grid.text(
+    title_text,
+    y = 0.975,
+    gp = gpar(fontsize = 16, fontface = "bold")
+  )
+
+  grid.text(
+    subhead_text,
+    y = 0.948,
+    gp = gpar(fontsize = 12, fontface = "bold")
+  )
+
+  if (!is.na(game_date)) {
+    grid.text(
+      game_date,
+      y = 0.925,
+      gp = gpar(fontsize = 9)
+    )
+  }
+}
+
+
 # =====================================================================
 # ======================  UMPIRE CODE  ================================
 # =====================================================================
@@ -3013,6 +3044,30 @@ umpire_create_report_pdf <- function(data,
     y = c( 0.150,  0.150,  0.300,  0.500,  0.300)
   )
   
+  # ---------------------------------------------------------------
+  # BUILD MISSED CALLS TABLE EARLY (before plots) so we can number them
+  # ---------------------------------------------------------------
+  MissedCalls <- dplyr::bind_rows(
+    data %>% filter(PitchCall %in% c("BallCalled", "BallinDirt"),
+                    PlateLocSide > -0.83083, PlateLocSide < 0.83083,
+                    PlateLocHeight < 3.37750, PlateLocHeight > 1.5),
+    data %>% filter(PitchCall == "StrikeCalled") %>%
+      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
+               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
+  ) %>%
+    arrange(PitchNo) %>%
+    mutate(CallNo = row_number()) %>%
+    mutate(
+      Side   = paste0(sprintf("%.0f", abs(PlateLocSide * 12)), '"'),
+      Height = paste0(sprintf("%.0f", PlateLocHeight * 12), '"')
+    )
+  
+  # Keep PlateLocSide/PlateLocHeight/BatterSide/BatterTeam available for plot filtering
+  # but select display columns for the table at the end
+  
+  # ---------------------------------------------------------------
+  # BASE ZONE HELPER
+  # ---------------------------------------------------------------
   base_zone <- function() {
     ggplot() +
       geom_rect(data = buffer_zone_rect,
@@ -3039,85 +3094,82 @@ umpire_create_report_pdf <- function(data,
       )
   }
   
-  umpire_create_ball_plot <- function(df, side_label, title_label) {
-    pts <- df %>%
+  # ---------------------------------------------------------------
+  # PLOT HELPERS — now use MissedCalls with CallNo labels
+  # ---------------------------------------------------------------
+  umpire_create_ball_plot <- function(mc, side_label, title_label) {
+    pts <- mc %>%
       filter(BatterSide == side_label,
              PitchCall %in% c("BallCalled", "BallinDirt"),
              PlateLocSide > -0.83083, PlateLocSide < 0.83083,
              PlateLocHeight < 3.37750, PlateLocHeight > 1.5)
     base_zone() +
       geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 2.5) +
+                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
+                color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
   }
   
-  umpire_create_strike_plot <- function(df, side_label, title_label) {
-    pts <- df %>%
+  umpire_create_strike_plot <- function(mc, side_label, title_label) {
+    pts <- mc %>%
       filter(BatterSide == side_label, PitchCall == "StrikeCalled") %>%
       filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
                PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
     base_zone() +
       geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 2.5) +
+                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
+                color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
   }
   
-  umpire_create_ball_plot_team <- function(df, is_ccu, title_label) {
-    pts <- df %>%
+  umpire_create_ball_plot_team <- function(mc, is_ccu, title_label) {
+    pts <- mc %>%
       filter(if (is_ccu) BatterTeam == "COA_CHA" else BatterTeam != "COA_CHA",
              PitchCall %in% c("BallCalled", "BallinDirt"),
              PlateLocSide > -0.83083, PlateLocSide < 0.83083,
              PlateLocHeight < 3.37750, PlateLocHeight > 1.5)
     base_zone() +
       geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 2.5) +
+                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
+                color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
   }
   
-  umpire_create_strike_plot_team <- function(df, is_ccu, title_label) {
-    pts <- df %>%
+  umpire_create_strike_plot_team <- function(mc, is_ccu, title_label) {
+    pts <- mc %>%
       filter(if (is_ccu) BatterTeam == "COA_CHA" else BatterTeam != "COA_CHA",
              PitchCall == "StrikeCalled") %>%
       filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
                PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
     base_zone() +
       geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 2.5) +
+                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
+                color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
   }
   
-  plot_ball_lhb   <- umpire_create_ball_plot(data, "Left",  "Ball Called v LHB")
-  plot_ball_rhb   <- umpire_create_ball_plot(data, "Right", "Ball Called v RHB")
-  plot_strike_lhb <- umpire_create_strike_plot(data, "Left",  "Strike Called v LHB")
-  plot_strike_rhb <- umpire_create_strike_plot(data, "Right", "Strike Called v RHB")
-  
-  plot_ball_ccu   <- umpire_create_ball_plot_team(data, TRUE,  "Ball Called v CCU Hitters")
-  plot_ball_opp   <- umpire_create_ball_plot_team(data, FALSE, "Ball Called v Opp Hitters")
-  plot_strike_ccu <- umpire_create_strike_plot_team(data, TRUE,  "Strike Called v CCU Hitters")
-  plot_strike_opp <- umpire_create_strike_plot_team(data, FALSE, "Strike Called v Opp Hitters")
-  
-  MissedCalls <- dplyr::bind_rows(
-    data %>% filter(BatterSide == "Left",
-                    PitchCall %in% c("BallCalled", "BallinDirt"),
-                    PlateLocSide > -0.83083, PlateLocSide < 0.83083,
-                    PlateLocHeight < 3.37750, PlateLocHeight > 1.5),
-    data %>% filter(BatterSide == "Right",
-                    PitchCall %in% c("BallCalled", "BallinDirt"),
-                    PlateLocSide > -0.83083, PlateLocSide < 0.83083,
-                    PlateLocHeight < 3.37750, PlateLocHeight > 1.5),
-    data %>% filter(BatterSide == "Left",  PitchCall == "StrikeCalled") %>%
-      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5),
-    data %>% filter(BatterSide == "Right", PitchCall == "StrikeCalled") %>%
-      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
-  ) %>%
-    mutate(
-      Side   = paste0(sprintf("%.0f", abs(PlateLocSide * 12)), '"'),
-      Height = paste0(sprintf("%.0f", PlateLocHeight * 12), '"')
-    ) %>%
-    arrange(PitchNo) %>%
-    select(dplyr::any_of(c("PitchNo","Inning","Top/Bottom","TopBottom",
+  # ---------------------------------------------------------------
+  # CREATE ALL PLOTS (pass MissedCalls instead of data)
+  # ---------------------------------------------------------------
+  plot_ball_lhb   <- umpire_create_ball_plot(MissedCalls, "Left",  "Ball Called v LHB")
+  plot_ball_rhb   <- umpire_create_ball_plot(MissedCalls, "Right", "Ball Called v RHB")
+  plot_strike_lhb <- umpire_create_strike_plot(MissedCalls, "Left",  "Strike Called v LHB")
+  plot_strike_rhb <- umpire_create_strike_plot(MissedCalls, "Right", "Strike Called v RHB")
+  
+  plot_ball_ccu   <- umpire_create_ball_plot_team(MissedCalls, TRUE,  "Ball Called v CCU Hitters")
+  plot_ball_opp   <- umpire_create_ball_plot_team(MissedCalls, FALSE, "Ball Called v Opp Hitters")
+  plot_strike_ccu <- umpire_create_strike_plot_team(MissedCalls, TRUE,  "Strike Called v CCU Hitters")
+  plot_strike_opp <- umpire_create_strike_plot_team(MissedCalls, FALSE, "Strike Called v Opp Hitters")
+  
+  # ---------------------------------------------------------------
+  # PREPARE DISPLAY TABLE (select only display columns, CallNo first)
+  # ---------------------------------------------------------------
+  MissedCallsDisplay <- MissedCalls %>%
+    select(dplyr::any_of(c("CallNo","PitchNo","Inning","Top/Bottom","TopBottom",
                            "Batter","PitchCall","Side","Height","BatterTeam")))
   
   green <- "#006F71"
@@ -3150,67 +3202,67 @@ umpire_create_report_pdf <- function(data,
     check.names = FALSE
   )
   
-draw_header <- function() {
-
-  suppressPackageStartupMessages({
-    library(grid)
-    library(magick)
-  })
-
-  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(
-      grid::rasterGrob(
-        as.raster(img),
-        interpolate = TRUE,
-        vp = viewport(
-          x = x,
-          y = 0.96,
-          width = 0.13,
-          height = 0.08,
-          just = c(just, "center")
+  draw_header <- function() {
+    
+    suppressPackageStartupMessages({
+      library(grid)
+      library(magick)
+    })
+    
+    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(
+        grid::rasterGrob(
+          as.raster(img),
+          interpolate = TRUE,
+          vp = viewport(
+            x = x,
+            y = 0.96,
+            width = 0.13,
+            height = 0.08,
+            just = c(just, "center")
+          )
         )
       )
+    }
+    
+    ## --- EMBEDDED LOGO LINKS ---
+    left_logo_url  <- "https://i.imgur.com/zjTu3JS.png"
+    right_logo_url <- "https://i.ibb.co/Q3kFXXd9/8acd1b8a-7920-403a-8e9d-86742634effb.png"
+    
+    draw_logo_url(left_logo_url,  0.05, "left")
+    draw_logo_url(right_logo_url, 0.95, "right")
+    
+    ## --- HEADER TEXT ---
+    grid.text(
+      title_text,
+      y = 0.975,
+      gp = gpar(fontsize = 16, fontface = "bold")
     )
-  }
-
-  ## --- EMBEDDED LOGO LINKS ---
-  left_logo_url  <- "https://i.imgur.com/zjTu3JS.png"
-  right_logo_url <- "https://i.ibb.co/Q3kFXXd9/8acd1b8a-7920-403a-8e9d-86742634effb.png"
-
-  draw_logo_url(left_logo_url,  0.05, "left")
-  draw_logo_url(right_logo_url, 0.95, "right")
-
-  ## --- HEADER TEXT ---
-  grid.text(
-    title_text,
-    y = 0.975,
-    gp = gpar(fontsize = 16, fontface = "bold")
-  )
-
-  grid.text(
-    subhead_text,
-    y = 0.948,
-    gp = gpar(fontsize = 12, fontface = "bold")
-  )
-
-  if (!is.na(game_date)) {
+    
     grid.text(
-      game_date,
-      y = 0.925,
-      gp = gpar(fontsize = 9)
+      subhead_text,
+      y = 0.948,
+      gp = gpar(fontsize = 12, fontface = "bold")
     )
+    
+    if (!is.na(game_date)) {
+      grid.text(
+        game_date,
+        y = 0.925,
+        gp = gpar(fontsize = 9)
+      )
+    }
   }
-}
-
+  
   grDevices::pdf(output_file, width = 8.5, height = 11)
   
   grid.newpage()
@@ -3231,8 +3283,8 @@ draw_header <- function() {
   popViewport()
   
   grid.newpage()
-
- grid::grid.text("Data: TrackMan | Report Generated: Coastal Carolina Baseball Analytics",
+  
+  grid::grid.text("Data: TrackMan | Report Generated: Coastal Carolina Baseball Analytics",
                   x = 0.5, y = 0.02, gp = grid::gpar(cex = 0.75, col = "grey50"))
   
   pushViewport(viewport(x = 0.28, y = 0.81, width = 0.47, height = 0.27)); print(plot_ball_ccu,   newpage = FALSE); popViewport()
@@ -3240,25 +3292,25 @@ draw_header <- function() {
   pushViewport(viewport(x = 0.28, y = 0.60, width = 0.47, height = 0.27)); print(plot_strike_ccu, newpage = FALSE); popViewport()
   pushViewport(viewport(x = 0.72, y = 0.60, width = 0.47, height = 0.27)); print(plot_strike_opp, newpage = FALSE); popViewport()
   
-  if (nrow(MissedCalls) > 0) {
-    # First page can fit 10 rows in the bottom half
+  if (nrow(MissedCallsDisplay) > 0) {
+    # First page can fit 15 rows in the bottom half
     first_page_rows <- 15
     remaining_page_rows <- rows_per_page  # 30 rows per full page
     
-    if (nrow(MissedCalls) <= first_page_rows) {
+    if (nrow(MissedCallsDisplay) <= first_page_rows) {
       # Fits on current page
       pushViewport(viewport(x = 0.5, y = 0.30, width = 0.92, height = 0.50))
-      grid.table(MissedCalls, rows = NULL, theme = ttheme_green_small)
+      grid.table(MissedCallsDisplay, rows = NULL, theme = ttheme_green_small)
       popViewport()
     } else {
       # First batch on current page
-      first_chunk <- MissedCalls[1:first_page_rows, , drop = FALSE]
+      first_chunk <- MissedCallsDisplay[1:first_page_rows, , drop = FALSE]
       pushViewport(viewport(x = 0.5, y = 0.30, width = 0.92, height = 0.50))
       grid.table(first_chunk, rows = NULL, theme = ttheme_green_small)
       popViewport()
       
       # Remaining rows paginated onto new pages
-      remaining <- MissedCalls[(first_page_rows + 1):nrow(MissedCalls), , drop = FALSE]
+      remaining <- MissedCallsDisplay[(first_page_rows + 1):nrow(MissedCallsDisplay), , drop = FALSE]
       remaining_chunks <- split(remaining, ceiling(seq_len(nrow(remaining)) / remaining_page_rows))
       
       for (i in seq_along(remaining_chunks)) {
@@ -3276,6 +3328,7 @@ draw_header <- function() {
   invisible(output_file)
 }
 
+
 # Advanced Pitcher Functions
 `%||%` <- function(a, b) if (!is.null(a)) a else b