Update app.R

app.R

@@ -2,6 +2,7 @@ library(shiny)
 library(dplyr)
 library(arrow)
 library(DT)
+library(ggplot2)
 
 # ── Load data ──────────────────────────────────────────────────────────────────
 load_data <- function(level) {
@@ -9,6 +10,29 @@ load_data <- function(level) {
   arrow::read_parquet(path)
 }
 
+# ── Pitch colors ───────────────────────────────────────────────────────────────
+pitch_colors <- c(
+  "Fastball"   = "red",       "Sinker"    = "orange",
+  "Slider"     = "gold",      "Sweeper"   = "pink",
+  "Curveball"  = "blue",      "Changeup"  = "green3",
+  "Cutter"     = "#8B4513",   "Splitter"  = "mediumpurple3"
+)
+
+clean_pitch_type <- function(pt) {
+  dplyr::case_when(
+    pt %in% c("Fastball","FourSeamFastBall","Four-Seam","FourSeam") ~ "Fastball",
+    pt %in% c("Sinker","TwoSeamFastBall","OneSeamFastball")         ~ "Sinker",
+    pt == "Cutter"                                                   ~ "Cutter",
+    pt %in% c("Curveball","CurveBall")                              ~ "Curveball",
+    pt == "Slider"                                                   ~ "Slider",
+    pt == "Sweeper"                                                  ~ "Sweeper",
+    pt %in% c("ChangeUp","Changeup")                                ~ "Changeup",
+    pt == "Splitter"                                                 ~ "Splitter",
+    TRUE                                                             ~ NA_character_
+  )
+}
+
+# ── Pitcher stats ──────────────────────────────────────────────────────────────
 build_pitcher_stats <- function(df, min_pitches) {
 
   format_name <- function(name) {
@@ -16,7 +40,6 @@ build_pitcher_stats <- function(df, min_pitches) {
     if (length(parts) == 2) paste(trimws(parts[2]), trimws(parts[1])) else name
   }
 
-  # grab team lookup separately before any grouping
   team_lookup <- df %>%
     select(Pitcher, PitcherTeam) %>%
     distinct(Pitcher, .keep_all = TRUE)
@@ -88,7 +111,9 @@ build_pitcher_stats <- function(df, min_pitches) {
       `Chase%`    = round(chase_n   / pmax(outzone_n, 1) * 100, 1),
       `FB Velo`   = ifelse(fb_velo_n == 0, NA_real_,
                            round(fb_velo_sum / fb_velo_n, 1)),
-      `Hard Hit%` = round(hh_n      / pmax(bip_n,     1) * 100, 1)
+      `Hard Hit%` = round(hh_n      / pmax(bip_n,     1) * 100, 1),
+      `Plot`      = paste0('<button class="plot-btn" data-pitcher="',
+                           Pitcher, '">📊 View</button>')
     ) %>%
     filter(
       !is.na(Name),
@@ -96,11 +121,11 @@ build_pitcher_stats <- function(df, min_pitches) {
       grepl(" ", trimws(Name))
     ) %>%
     select(Name, Level, Team, Pitches, `FB Velo`, `Zone%`, `Strike%`,
-           `K's`, `BB's`, `K/BB`, `Whiff%`, `Chase%`, `Hard Hit%`) %>%
+           `K's`, `BB's`, `K/BB`, `Whiff%`, `Chase%`, `Hard Hit%`, `Plot`) %>%
     arrange(desc(Pitches))
 }
 
-## UI ##
+# ── UI ─────────────────────────────────────────────────────────────────────────
 ui <- fluidPage(
   tags$head(
     tags$style(HTML("
@@ -120,18 +145,17 @@ ui <- fluidPage(
       .main { padding:20px 24px; }
       .form-control { border:1px solid #d0d0d0; border-radius:4px; }
 
-      /* table */
       .dataTables_wrapper { background:white; border-radius:8px;
                             padding:16px; box-shadow:0 1px 4px rgba(0,0,0,0.08); }
       .dataTables_filter input { border:1px solid #d0d0d0; border-radius:4px;
                                  padding:4px 8px; }
       .dataTables_length select { border:1px solid #d0d0d0; border-radius:4px; }
       table.dataTable thead th {
-        background:#002147; color:white; font-weight:600;
+        background:#002147 !important; color:white !important; font-weight:600;
         font-size:12px; text-transform:uppercase; letter-spacing:0.3px;
         border-bottom:none !important; cursor:pointer;
       }
-      table.dataTable thead th:hover { background:#003366; }
+      table.dataTable thead th:hover { background:#003366 !important; }
       table.dataTable tbody tr { background:white; }
       table.dataTable tbody tr:nth-child(even) { background:#f7f9fc; }
       table.dataTable tbody tr:hover { background:#eef2f7 !important; }
@@ -139,7 +163,25 @@ ui <- fluidPage(
                                   border-bottom:1px solid #f0f0f0; }
       table.dataTable tbody td:first-child { font-weight:600; color:#002147; }
 
-      /* splash */
+      .plot-btn {
+        background:#002147; color:white; border:none; border-radius:4px;
+        padding:4px 10px; font-size:12px; cursor:pointer; font-weight:600;
+      }
+      .plot-btn:hover { background:#003366; }
+
+      /* modal */
+      .modal-backdrop { position:fixed; top:0; left:0; width:100%; height:100%;
+                        background:rgba(0,0,0,0.5); z-index:1000;
+                        display:flex; align-items:center; justify-content:center; }
+      .modal-box { background:white; border-radius:10px; padding:24px;
+                   width:700px; max-width:95vw; position:relative;
+                   box-shadow:0 4px 20px rgba(0,0,0,0.3);
+                   max-height:90vh; overflow-y:auto; }
+      .modal-close { position:absolute; top:12px; right:16px; font-size:20px;
+                     cursor:pointer; color:#555; background:none; border:none; }
+      .modal-title { font-size:18px; font-weight:700; color:#002147;
+                     margin:0 0 16px 0; }
+
       #splash {
         position:fixed; top:0; left:0; width:100%; height:100%;
         background:#002147; display:flex; flex-direction:column;
@@ -177,10 +219,23 @@ ui <- fluidPage(
 
     tags$script(HTML("
       $(document).ready(function() {
+
+        // splash
         setTimeout(function() {
           $('#splash').addClass('fade-out');
           setTimeout(function() { $('#splash').remove(); }, 800);
         }, 2800);
+
+        // plot button click — delegate since table renders after doc ready
+        $(document).on('click', '.plot-btn', function() {
+          var pitcher = $(this).data('pitcher');
+          Shiny.setInputValue('selected_pitcher', pitcher, {priority: 'event'});
+        });
+
+        // close modal
+        $(document).on('click', '#modal_close', function() {
+          $('#pitcher_modal').remove();
+        });
       });
     "))
   ),
@@ -188,7 +243,7 @@ ui <- fluidPage(
   # splash
   tags$div(id="splash",
     tags$img(src="Butler-Bulldogs-Logo-1990.png"),
-    tags$h1("Butler Baseball TPD"),
+    tags$h1("Butler Baseball Transfer Portal"),
     tags$p("Butler Baseball Analytics"),
     tags$div(class="bar-track", tags$div(class="bar-fill"))
   ),
@@ -228,44 +283,56 @@ ui <- fluidPage(
 
   # main
   tags$div(class="main",
-    uiOutput("main_ui")
+    uiOutput("main_ui"),
+    uiOutput("pitcher_modal")
   )
 )
 
 # ── Server ─────────────────────────────────────────────────────────────────────
 server <- function(input, output, session) {
 
-  # load data reactively when level changes
   raw_data <- reactive({
     req(input$level)
-    load_data(input$level)
+    tryCatch(
+      load_data(input$level),
+      error = function(e) {
+        showNotification(paste("Failed to load data:", e$message), type="error")
+        NULL
+      }
+    )
   })
 
-  # build stats table
   stats_table <- reactive({
     req(raw_data(), input$min_pitches)
     if (input$position == "Pitcher") {
       build_pitcher_stats(raw_data(), input$min_pitches)
     }
-    # hitter branch coming soon
   })
 
   output$main_ui <- renderUI({
     if (input$position == "Pitcher") {
-      DTOutput("pitcher_table")
+      tagList(
+        tags$p(id="loading_msg", "Loading data...",
+               style="color:#888; font-size:14px; padding:10px 0;"),
+        DTOutput("pitcher_table")
+      )
     } else {
       tags$p("Hitter view coming soon.", style="color:#888;")
     }
   })
 
-output$pitcher_table <- renderDT({
+  output$pitcher_table <- renderDT({
+    req(raw_data())
     req(stats_table())
+    req(nrow(stats_table()) > 0)
+
     dt <- stats_table()
 
-# ── Color ranges (edit these when ready) ──────────────────────────────────
+    # ── Color ranges (edit these when ready) ──────────────────────────────────
     # zone_pct_range   <- c(42, 53)
     # strike_pct_range <- c(58, 67)
-    # kb_range         <- c(1.5, 4.0)   # K/BB ratio
+    # fb_velo_range    <- c(88, 95)
+    # kb_range         <- c(1.5, 4.0)
     # whiff_range      <- c(15, 35)
     # chase_range      <- c(25, 40)
     # hardhit_range    <- c(25, 42)
@@ -274,20 +341,148 @@ output$pitcher_table <- renderDT({
     datatable(
       dt,
       rownames  = FALSE,
-      selection = "single",
+      escape    = FALSE,
+      selection = "none",
       options   = list(
-        pageLength = 25,
-        lengthMenu = c(25, 50, 100),
-        scrollX    = TRUE,
-        order      = list(list(3, "desc")),
-        dom        = "lfrtip",
-        columnDefs = list(
-          list(className="dt-center", targets=2:12),
-          list(className="dt-left",   targets=0:1)
-        )
+        pageLength   = 25,
+        lengthMenu   = c(25, 50, 100),
+        scrollX      = TRUE,
+        order        = list(list(3, "desc")),
+        orderMulti   = FALSE,
+        dom          = "lfrtip",
+        columnDefs   = list(
+          list(className="dt-center", targets=2:13),
+          list(className="dt-left",   targets=0:1),
+          list(orderable=FALSE,        targets=13)
+        ),
+        initComplete = JS("function(settings, json) {
+          $('#loading_msg').hide();
+        }")
       )
     )
   })
+
+  # movement plot modal
+  observeEvent(input$selected_pitcher, {
+    req(input$selected_pitcher, raw_data())
+
+    pitcher_raw <- input$selected_pitcher
+
+    pdata <- raw_data() %>%
+      filter(Pitcher == pitcher_raw) %>%
+      mutate(PitchType = clean_pitch_type(TaggedPitchType)) %>%
+      filter(!is.na(PitchType), !is.na(HorzBreak), !is.na(InducedVertBreak))
+
+    req(nrow(pdata) > 0)
+
+    # format display name
+    parts <- strsplit(pitcher_raw, ", ")[[1]]
+    display_name <- if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else pitcher_raw
+
+    avg_data <- pdata %>%
+      group_by(PitchType) %>%
+      summarise(
+        HB   = mean(HorzBreak,       na.rm=TRUE),
+        iVB  = mean(InducedVertBreak,na.rm=TRUE),
+        Velo = round(mean(RelSpeed,  na.rm=TRUE),1),
+        .groups="drop"
+      )
+
+    p <- ggplot() +
+      geom_vline(xintercept=0, color="black") +
+      geom_hline(yintercept=0, color="black") +
+      geom_point(data=pdata,
+                 aes(x=HorzBreak, y=InducedVertBreak, fill=PitchType),
+                 size=3, alpha=0.6, shape=21, color="black", stroke=0.4) +
+      geom_point(data=avg_data,
+                 aes(x=HB, y=iVB, color=PitchType),
+                 size=9, alpha=0.9) +
+      geom_text(data=avg_data,
+                aes(x=HB, y=iVB, label=Velo),
+                color="white", size=3, fontface="bold") +
+      scale_fill_manual(values=pitch_colors,  name=NULL, drop=TRUE) +
+      scale_color_manual(values=pitch_colors, name=NULL, drop=TRUE) +
+      xlim(-25,25) + ylim(-25,25) +
+      labs(title=paste(display_name, "— Pitch Movement"),
+           x="Horizontal Break (in)", y="Induced Vertical Break (in)") +
+      theme_minimal() +
+      theme(
+        plot.title      = element_text(hjust=0.5, size=13, face="bold", color="#002147"),
+        legend.position = "bottom",
+        legend.text     = element_text(size=9),
+        legend.key.size = unit(0.4,"cm")
+      )
+
+    pitch_table <- pdata %>%
+      mutate(
+        IsStrike  = PitchCall %in% c("StrikeCalled","StrikeSwinging","FoulBall",
+                                     "FoulBallNotFieldable","FoulTip","InPlay"),
+        IsZone    = !is.na(PlateLocSide) & !is.na(PlateLocHeight) &
+          abs(PlateLocSide) <= 0.8303 & PlateLocHeight >= 1.5 & PlateLocHeight <= 3.3775,
+        IsWhiff   = PitchCall == "StrikeSwinging",
+        IsSwing   = PitchCall %in% c("StrikeSwinging","FoulBall",
+                                     "FoulBallNotFieldable","FoulTip","InPlay"),
+        IsChase   = IsSwing & !IsZone,
+        IsOutZone = !IsZone,
+        IsHardHit = !is.na(ExitSpeed) & ExitSpeed >= 95 &
+          !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip")
+      ) %>%
+      group_by(`Pitch Type`=PitchType) %>%
+      summarise(
+        `#`        = n(),
+        `Usage%`   = round(n() / nrow(pdata) * 100, 1),
+        Velo       = round(mean(RelSpeed,          na.rm=TRUE), 1),
+        iVB        = round(mean(InducedVertBreak,  na.rm=TRUE), 1),
+        HB         = round(mean(HorzBreak,         na.rm=TRUE), 1),
+        Spin       = round(mean(SpinRate,           na.rm=TRUE), 0),
+        RelH = round(mean(RelHeight, na.rm=TRUE), 1),
+        RelS = round(mean(RelSide, na.rm=TRUE), 1),
+        VAA = round(mean(VertApprAngle, na.rm=TRUE), 1),
+        HAA = round(mean(HorzApprAngle, na.rm=TRUE), 1),
+        `Zone%`    = round(sum(IsZone,    na.rm=TRUE) / n() * 100, 1),
+        `Strike%`  = round(sum(IsStrike,  na.rm=TRUE) / n() * 100, 1),
+        `Whiff%`   = round(ifelse(sum(IsSwing)==0, NA,
+                                  sum(IsWhiff)/sum(IsSwing)*100), 1),
+        `Chase%`   = round(ifelse(sum(IsOutZone)==0, NA,
+                                  sum(IsChase)/sum(IsOutZone)*100), 1),
+        `Hard Hit%`= round(ifelse(sum(!is.na(ExitSpeed))==0, NA,
+                                  sum(IsHardHit)/sum(!is.na(ExitSpeed))*100), 1),
+        .groups    = "drop"
+      ) %>%
+      arrange(desc(`#`)) %>%
+      mutate(across(where(is.numeric), ~ifelse(is.nan(.), NA, .)))
+
+    output$pitch_type_table <- renderDT({
+      datatable(
+        pitch_table,
+        rownames  = FALSE,
+        selection = "none",
+        options   = list(
+          pageLength = 10,
+          dom        = "t",
+          scrollX    = TRUE,
+          ordering   = TRUE,
+          columnDefs = list(
+            list(className="dt-center", targets=1:11),
+            list(className="dt-left",   targets=0)
+          )
+        )
+      )
+    })
+
+    output$pitcher_modal <- renderUI({
+      tags$div(class="modal-backdrop",
+        tags$div(class="modal-box",
+          tags$button("✕", id="modal_close", class="modal-close"),
+          tags$p(paste(display_name, "—", pdata$PitcherTeam[1]),
+                 class="modal-title"),
+          plotOutput("movement_plot", height="420px")
+        )
+      )
+    })
+
+    output$movement_plot <- renderPlot({ p })
+  })
 }
 
 shinyApp(ui, server)