Update app.R

app.R

@@ -201,6 +201,104 @@ build_pitcher_stats <- function(df, min_pitches, scores, portal) {
     arrange(desc(Pitches))
 }
 
+
+## Build Hitter Stats
+
+build_hitter_stats <- function(df, min_pa, hitter_portal) {
+
+  team_lookup <- df %>%
+    select(Batter, BatterTeam) %>%
+    distinct(Batter, .keep_all = TRUE)
+
+  df %>%
+    mutate(
+      IsSwing     = PitchCall %in% c("StrikeSwinging","FoulBall",
+                                     "FoulBallNotFieldable","FoulTip","InPlay"),
+      IsContact   = PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulTip","InPlay"),
+      IsWhiff     = PitchCall == "StrikeSwinging",
+      IsZone      = !is.na(PlateLocSide) & !is.na(PlateLocHeight) &
+        abs(PlateLocSide) <= 0.8303 & PlateLocHeight >= 1.5 & PlateLocHeight <= 3.3775,
+      IsChase     = IsSwing & !IsZone,
+      IsOutZone   = !IsZone,
+      IsZoneSwing = IsSwing & IsZone,
+      IsZoneWhiff = IsWhiff & IsZone,
+      IsHardHit   = !is.na(ExitSpeed) & ExitSpeed >= 95 &
+        !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip"),
+      IsBIP       = !is.na(ExitSpeed) &
+        !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip"),
+      IsGB        = IsBIP & TaggedHitType %in% c("Groundball","GroundBall"),
+      IsFB        = IsBIP & TaggedHitType == "FlyBall",
+      IsLD        = IsBIP & TaggedHitType == "LineDrive",
+      IsHit       = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun"),
+      IsAB        = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun",
+                                                            "Out","Error","FieldersChoice"),
+      IsPA        = (!is.na(KorBB) & KorBB %in% c("Strikeout","Walk")) |
+                    (!is.na(PitchCall) & PitchCall %in% c("InPlay","HitByPitch")),
+      IsHR        = !is.na(PlayResult) & PlayResult == "HomeRun",
+      IsBB        = !is.na(KorBB) & KorBB == "Walk",
+      IsK         = !is.na(KorBB) & KorBB == "Strikeout"
+    ) %>%
+    group_by(Batter, Level) %>%
+    summarise(
+      Pitches      = n(),
+      PA           = sum(IsPA,         na.rm = TRUE),
+      AB           = sum(IsAB,         na.rm = TRUE),
+      H            = sum(IsHit,        na.rm = TRUE),
+      HR           = sum(IsHR,         na.rm = TRUE),
+      BB           = sum(IsBB,         na.rm = TRUE),
+      K            = sum(IsK,          na.rm = TRUE),
+      hh_n         = sum(IsHardHit,    na.rm = TRUE),
+      bip_n        = sum(IsBIP,        na.rm = TRUE),
+      gb_n         = sum(IsGB,         na.rm = TRUE),
+      fb_n         = sum(IsFB,         na.rm = TRUE),
+      ld_n         = sum(IsLD,         na.rm = TRUE),
+      whiff_n      = sum(IsWhiff,      na.rm = TRUE),
+      swing_n      = sum(IsSwing,      na.rm = TRUE),
+      contact_n    = sum(IsContact,    na.rm = TRUE),
+      chase_n      = sum(IsChase,      na.rm = TRUE),
+      outzone_n    = sum(IsOutZone,    na.rm = TRUE),
+      zone_swing_n = sum(IsZoneSwing,  na.rm = TRUE),
+      zone_whiff_n = sum(IsZoneWhiff,  na.rm = TRUE),
+      ev_sum       = sum(ifelse(IsBIP, ExitSpeed, NA), na.rm = TRUE),
+      .groups      = "drop"
+    ) %>%
+    left_join(team_lookup, by = "Batter") %>%
+    filter(PA >= min_pa) %>%
+    left_join(
+      hitter_portal %>% select(Batter, Portal, Position, BatSide, BA, OBP, SLG),
+      by = "Batter"
+    ) %>%
+    mutate(
+      Portal      = ifelse(is.na(Portal), "No", as.character(Portal)),
+      BA          = ifelse(Portal == "No", NA_real_, as.numeric(BA)),
+      OBP         = ifelse(Portal == "No", NA_real_, as.numeric(OBP)),
+      SLG         = ifelse(Portal == "No", NA_real_, as.numeric(SLG)),
+      Name        = sapply(Batter, format_name),
+      Team        = BatterTeam,
+      AVG         = round(H   / pmax(AB, 1),                        3),
+      `BB%`       = round(BB  / pmax(PA, 1) * 100,                  1),
+      `K%`        = round(K   / pmax(PA, 1) * 100,                  1),
+      `Swing%`    = round(swing_n    / Pitches                * 100, 1),
+      `Contact%`  = round(contact_n  / pmax(swing_n,       1) * 100, 1),
+      `IZ Whiff%` = round(zone_whiff_n / pmax(zone_swing_n, 1) * 100, 1),
+      `Chase%`    = round(chase_n    / pmax(outzone_n,     1) * 100, 1),
+      `Hard Hit%` = round(hh_n       / pmax(bip_n,         1) * 100, 1),
+      `Avg EV`    = round(ev_sum     / pmax(bip_n,         1),        1),
+      `GB%`       = round(gb_n       / pmax(bip_n,         1) * 100, 1),
+      `FB%`       = round(fb_n       / pmax(bip_n,         1) * 100, 1),
+      `LD%`       = round(ld_n       / pmax(bip_n,         1) * 100, 1),
+      `Twitter`   = paste0('<a href="https://www.google.com/search?q=',
+                           gsub(" ", "+", sapply(Batter, format_name)),
+                           '+baseball+twitter" target="_blank">&#x1F426; Search</a>')
+    ) %>%
+    filter(!is.na(Name), trimws(Name) != "", grepl(" ", trimws(Name))) %>%
+    select(Name, Level, Team, Portal, Position, BatSide, `Twitter`, PA,
+           AVG, OBP, SLG, `BB%`, `K%`, `Swing%`, `Contact%`, `IZ Whiff%`,
+           `Chase%`, `Hard Hit%`, `Avg EV`, `GB%`, `FB%`, `LD%`,
+            ) %>%
+    arrange(desc(PA))
+}
+
 # ── UI ─────────────────────────────────────────────────────────────────────────
 ui <- fluidPage(
   useShinyjs(),
@@ -312,22 +410,38 @@ ui <- fluidPage(
           setTimeout(function() { $('#splash').remove(); }, 800);
         }, 2800);
 
+        // pitcher modal
         $(document).on('click', '.plot-btn', function() {
           var pitcher = $(this).data('pitcher');
           Shiny.setInputValue('selected_pitcher', pitcher, {priority: 'event'});
         });
-
         $(document).on('click', '#modal_close_btn', function() {
           $('#modal_wrapper').hide();
           Shiny.setInputValue('modal_closed', Math.random(), {priority: 'event'});
         });
-
         $(document).on('click', '#modal_wrapper', function(e) {
           if ($(e.target).is('#modal_wrapper')) {
             $('#modal_wrapper').hide();
             Shiny.setInputValue('modal_closed', Math.random(), {priority: 'event'});
           }
         });
+
+        // hitter modal
+        $(document).on('click', '.hitter-name-btn', function() {
+          var batter = $(this).data('batter');
+          Shiny.setInputValue('selected_batter', batter, {priority: 'event'});
+        });
+        $(document).on('click', '#hitter_modal_close_btn', function() {
+          $('#hitter_modal_wrapper').hide();
+          Shiny.setInputValue('hitter_modal_closed', Math.random(), {priority: 'event'});
+        });
+        $(document).on('click', '#hitter_modal_wrapper', function(e) {
+          if ($(e.target).is('#hitter_modal_wrapper')) {
+            $('#hitter_modal_wrapper').hide();
+            Shiny.setInputValue('hitter_modal_closed', Math.random(), {priority: 'event'});
+          }
+        });
+
       });
     "))
   ),
@@ -390,6 +504,19 @@ ui <- fluidPage(
       DTOutput("pitch_type_table")
     )
   )
+# hitter modal
+  tags$div(
+    id = "hitter_modal_wrapper", class = "modal-overlay", style = "display:none;",
+    tags$div(
+      class = "modal-box",
+      tags$button("✕", id = "hitter_modal_close_btn", class = "modal-close"),
+      uiOutput("hitter_modal_header"),
+      tags$div("vs. Handedness", class = "section-label"),
+      DTOutput("hitter_hand_table"),
+      tags$div("vs. Pitch Type", class = "section-label"),
+      DTOutput("hitter_pitch_table")
+    )
+  )
 )
 
 # ── Server ─────────────────────────────────────────────────────────────────────
@@ -399,9 +526,10 @@ server <- function(input, output, session) {
     req(input$level)
     tryCatch({
       list(
-        df     = load_data(input$level),
-        scores = load_scores(input$level),
-        portal = load_portal()
+        df            = load_data(input$level),
+        scores        = load_scores(input$level),
+        portal        = load_portal(),
+        hitter_portal = load_hitter_portal()
       )
     }, error = function(e) {
       showNotification(paste("Failed to load:", e$message), type = "error")
@@ -426,6 +554,20 @@ server <- function(input, output, session) {
         showNotification(paste("Stats error:", e$message), type = "error")
         NULL
       })
+    } else {
+      tryCatch({
+        df <- build_hitter_stats(
+          raw_data()$df,
+          input$min_pitches,
+          raw_data()$hitter_portal
+        )
+        if (input$portal_only) df <- df %>% filter(Portal == "Yes")
+        df
+      }, error = function(e) {
+        message("build_hitter_stats failed: ", e$message)
+        showNotification(paste("Stats error:", e$message), type = "error")
+        NULL
+      })
     }
   })
 
@@ -437,10 +579,47 @@ server <- function(input, output, session) {
         DTOutput("pitcher_table")
       )
     } else {
-      tags$p("Hitter view coming soon.", style = "color:#888;")
+      tagList(
+        tags$p(id = "loading_msg", "Loading data...",
+               style = "color:#888; font-size:14px; padding:10px 0;"),
+        DTOutput("hitter_table")
+      )
     }
   })
 
+  output$hitter_table <- renderDT({
+    req(stats_table(), nrow(stats_table()) > 0)
+    dt <- stats_table()
+
+    datatable(
+      dt,
+      rownames  = FALSE,
+      escape    = FALSE,
+      selection = "none",
+      options   = list(
+        pageLength  = 25,
+        lengthMenu  = c(25, 50, 100),
+        scrollX     = TRUE,
+        order       = list(list(7, "desc")),
+        orderMulti  = FALSE,
+        dom         = "lfrtip",
+        columnDefs  = list(
+          list(className = "dt-left",   targets = 0:1),
+          list(className = "dt-center", targets = 2:21),
+          list(orderable = FALSE,       targets = 6)
+        ),
+        initComplete = JS("function(settings, json) {
+          $('#loading_msg').hide();
+        }")
+      )
+    ) %>%
+      formatStyle(
+        "Portal",
+        color      = styleEqual(c("Yes","No"), c("#00840D","#aaaaaa")),
+        fontWeight = styleEqual(c("Yes","No"), c("700","400"))
+      )
+  })
+
   output$pitcher_table <- renderDT({
     req(stats_table(), nrow(stats_table()) > 0)
     dt <- stats_table()
@@ -498,6 +677,174 @@ server <- function(input, output, session) {
     shinyjs::hide("modal_wrapper")
   })
 
+  # ── Hitter modal ─────────────────────────────────────────────────────────────
+  current_batter <- reactiveVal(NULL)
+
+  observeEvent(input$selected_batter, {
+    req(input$selected_batter, raw_data())
+    current_batter(input$selected_batter)
+    shinyjs::delay(100, shinyjs::show("hitter_modal_wrapper"))
+  })
+
+  observeEvent(input$hitter_modal_closed, {
+    shinyjs::hide("hitter_modal_wrapper")
+  })
+
+  batter_data <- reactive({
+    req(current_batter(), raw_data())
+    raw_data()$df %>%
+      filter(Batter == current_batter()) %>%
+      mutate(
+        PitchGroup = case_when(
+          TaggedPitchType %in% c("Fastball","FourSeamFastBall","Four-Seam","FourSeam",
+                                 "Sinker","TwoSeamFastBall","OneSeamFastball","Cutter") ~ "Fastball",
+          TaggedPitchType %in% c("Slider","Sweeper","Curveball","CurveBall")            ~ "Breaker",
+          TaggedPitchType %in% c("Changeup","ChangeUp","Splitter")                      ~ "Offspeed",
+          TRUE                                                                           ~ NA_character_
+        )
+      )
+  })
+
+  output$hitter_modal_header <- renderUI({
+    req(current_batter())
+    parts        <- strsplit(current_batter(), ", ")[[1]]
+    display_name <- if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else current_batter()
+    pdata        <- batter_data()
+    team         <- if (nrow(pdata)>0) pdata$BatterTeam[1] else ""
+    tagList(
+      tags$p(display_name, class = "modal-title"),
+      tags$p(team,         class = "modal-subtitle")
+    )
+  })
+
+  output$hitter_hand_table <- renderDT({
+    req(batter_data(), nrow(batter_data()) > 0)
+    pdata <- batter_data()
+
+    hand_table <- pdata %>%
+      mutate(
+        IsHit     = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun"),
+        IsAB      = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun",
+                                                            "Out","Error","FieldersChoice"),
+        IsPA      = (!is.na(KorBB) & KorBB %in% c("Strikeout","Walk")) |
+                    (!is.na(PitchCall) & PitchCall %in% c("InPlay","HitByPitch")),
+        IsHR      = !is.na(PlayResult) & PlayResult == "HomeRun",
+        IsBB      = !is.na(KorBB) & KorBB == "Walk",
+        IsK       = !is.na(KorBB) & KorBB == "Strikeout",
+        IsSwing   = PitchCall %in% c("StrikeSwinging","FoulBall",
+                                     "FoulBallNotFieldable","FoulTip","InPlay"),
+        IsWhiff   = PitchCall == "StrikeSwinging",
+        IsHardHit = !is.na(ExitSpeed) & ExitSpeed >= 95 &
+          !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip"),
+        IsBIP     = !is.na(ExitSpeed) &
+          !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip")
+      ) %>%
+      filter(!is.na(PitcherThrows), PitcherThrows != "") %>%
+      group_by(Hand = PitcherThrows) %>%
+      summarise(
+        PA      = sum(IsPA,      na.rm=TRUE),
+        AB      = sum(IsAB,      na.rm=TRUE),
+        H       = sum(IsHit,     na.rm=TRUE),
+        HR      = sum(IsHR,      na.rm=TRUE),
+        BB      = sum(IsBB,      na.rm=TRUE),
+        K       = sum(IsK,       na.rm=TRUE),
+        hh_n    = sum(IsHardHit, na.rm=TRUE),
+        bip_n   = sum(IsBIP,     na.rm=TRUE),
+        whiff_n = sum(IsWhiff,   na.rm=TRUE),
+        swing_n = sum(IsSwing,   na.rm=TRUE),
+        .groups = "drop"
+      ) %>%
+      mutate(
+        AVG         = round(H  / pmax(AB,      1), 3),
+        OBP         = round((H + BB) / pmax(PA, 1), 3),
+        `K%`        = round(K  / pmax(PA,      1) * 100, 1),
+        `BB%`       = round(BB / pmax(PA,      1) * 100, 1),
+        `Hard Hit%` = round(hh_n    / pmax(bip_n,   1) * 100, 1),
+        `Whiff%`    = round(whiff_n / pmax(swing_n, 1) * 100, 1)
+      ) %>%
+      select(Hand, PA, AVG, OBP, HR, `BB%`, `K%`, `Hard Hit%`, `Whiff%`)
+
+    datatable(
+      hand_table,
+      rownames  = FALSE,
+      selection = "none",
+      options   = list(
+        pageLength = 5, dom = "t", scrollX = TRUE, ordering = TRUE,
+        columnDefs = list(
+          list(className = "dt-center", targets = 1:8),
+          list(className = "dt-left",   targets = 0)
+        )
+      )
+    )
+  })
+
+  output$hitter_pitch_table <- renderDT({
+    req(batter_data(), nrow(batter_data()) > 0)
+    pdata <- batter_data()
+
+    pitch_table <- pdata %>%
+      mutate(
+        IsZone    = !is.na(PlateLocSide) & !is.na(PlateLocHeight) &
+          abs(PlateLocSide) <= 0.8303 & PlateLocHeight >= 1.5 & PlateLocHeight <= 3.3775,
+        IsHit     = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun"),
+        IsAB      = !is.na(PlayResult) & PlayResult %in% c("Single","Double","Triple","HomeRun",
+                                                            "Out","Error","FieldersChoice"),
+        IsPA      = (!is.na(KorBB) & KorBB %in% c("Strikeout","Walk")) |
+                    (!is.na(PitchCall) & PitchCall %in% c("InPlay","HitByPitch")),
+        IsHR      = !is.na(PlayResult) & PlayResult == "HomeRun",
+        IsBB      = !is.na(KorBB) & KorBB == "Walk",
+        IsK       = !is.na(KorBB) & KorBB == "Strikeout",
+        IsSwing   = PitchCall %in% c("StrikeSwinging","FoulBall",
+                                     "FoulBallNotFieldable","FoulTip","InPlay"),
+        IsWhiff   = PitchCall == "StrikeSwinging",
+        IsChase   = IsSwing & !IsZone,
+        IsOutZone = !IsZone,
+        IsHardHit = !is.na(ExitSpeed) & ExitSpeed >= 95 &
+          !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip"),
+        IsBIP     = !is.na(ExitSpeed) &
+          !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip")
+      ) %>%
+      filter(!is.na(PitchGroup)) %>%
+      group_by(`Pitch Type` = PitchGroup) %>%
+      summarise(
+        Pitches   = n(),
+        PA        = sum(IsPA,      na.rm=TRUE),
+        AB        = sum(IsAB,      na.rm=TRUE),
+        H         = sum(IsHit,     na.rm=TRUE),
+        HR        = sum(IsHR,      na.rm=TRUE),
+        K         = sum(IsK,       na.rm=TRUE),
+        hh_n      = sum(IsHardHit, na.rm=TRUE),
+        bip_n     = sum(IsBIP,     na.rm=TRUE),
+        whiff_n   = sum(IsWhiff,   na.rm=TRUE),
+        swing_n   = sum(IsSwing,   na.rm=TRUE),
+        chase_n   = sum(IsChase,   na.rm=TRUE),
+        outzone_n = sum(IsOutZone, na.rm=TRUE),
+        .groups   = "drop"
+      ) %>%
+      mutate(
+        AVG         = round(H  / pmax(AB,         1), 3),
+        `K%`        = round(K  / pmax(PA,         1) * 100, 1),
+        `Hard Hit%` = round(hh_n    / pmax(bip_n,    1) * 100, 1),
+        `Whiff%`    = round(whiff_n / pmax(swing_n,  1) * 100, 1),
+        `Chase%`    = round(chase_n / pmax(outzone_n,1) * 100, 1)
+      ) %>%
+      select(`Pitch Type`, Pitches, PA, AVG, HR, `K%`, `Hard Hit%`, `Whiff%`, `Chase%`) %>%
+      arrange(desc(Pitches))
+
+    datatable(
+      pitch_table,
+      rownames  = FALSE,
+      selection = "none",
+      options   = list(
+        pageLength = 5, dom = "t", scrollX = TRUE, ordering = TRUE,
+        columnDefs = list(
+          list(className = "dt-center", targets = 1:8),
+          list(className = "dt-left",   positions = 0)
+        )
+      )
+    )
+  })
+
   pitcher_plot_data <- reactive({
     req(current_pitcher(), raw_data())
     raw_data()$df %>%