Update app.R

app.R

@@ -24,12 +24,12 @@ load_portal <- function() {
       rename(Pitcher = pitcher, Portal = portal) %>%
       distinct(Pitcher, .keep_all = TRUE)
   },
-    error = function(e) {
-      message("Portal load failed: ", e$message)
-      tibble(Pitcher=character(), Portal=character())
-    }
-  )
+  error = function(e) {
+    message("Portal load failed: ", e$message)
+    tibble(Pitcher = character(), Portal = character())
+  })
 }
+
 # ── Pitch colors ───────────────────────────────────────────────────────────────
 pitch_colors <- c(
   "Fastball"  = "red",       "Sinker"   = "orange",
@@ -63,7 +63,7 @@ build_pitcher_stats <- function(df, min_pitches, scores, portal) {
 
   team_lookup <- df %>%
     select(Pitcher, PitcherTeam) %>%
-    distinct(Pitcher, .keep_all=TRUE)
+    distinct(Pitcher, .keep_all = TRUE)
 
   df %>%
     mutate(
@@ -86,39 +86,39 @@ build_pitcher_stats <- function(df, min_pitches, scores, portal) {
     group_by(Pitcher, Level) %>%
     summarise(
       Pitches     = n(),
-      K           = sum(IsK,       na.rm=TRUE),
-      BB          = sum(IsBB,      na.rm=TRUE),
-      PA          = sum(IsPA,      na.rm=TRUE),
-      zone_n      = sum(IsZone,    na.rm=TRUE),
-      strike_n    = sum(IsStrike,  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),
-      hh_n        = sum(IsHardHit, na.rm=TRUE),
+      K           = sum(IsK,       na.rm = TRUE),
+      BB          = sum(IsBB,      na.rm = TRUE),
+      PA          = sum(IsPA,      na.rm = TRUE),
+      zone_n      = sum(IsZone,    na.rm = TRUE),
+      strike_n    = sum(IsStrike,  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),
+      hh_n        = sum(IsHardHit, na.rm = TRUE),
       bip_n       = sum(!is.na(ExitSpeed) &
                       !PitchCall %in% c("FoulBall","FoulBallNotFieldable",
-                                        "FoulBallFieldable","FoulTip"), na.rm=TRUE),
+                                        "FoulBallFieldable","FoulTip"), na.rm = TRUE),
       fb_velo_sum = sum(ifelse(!is.na(RelSpeed) &
                                  TaggedPitchType %in% c("Fastball","FourSeamFastBall",
                                                         "Four-Seam","FourSeam",
                                                         "Sinker","TwoSeamFastBall",
                                                         "OneSeamFastball","Cutter"),
-                               RelSpeed, NA), na.rm=TRUE),
+                               RelSpeed, NA), na.rm = TRUE),
       fb_velo_n   = sum(!is.na(RelSpeed) &
                           TaggedPitchType %in% c("Fastball","FourSeamFastBall",
                                                  "Four-Seam","FourSeam",
                                                  "Sinker","TwoSeamFastBall",
                                                  "OneSeamFastball","Cutter"),
-                        na.rm=TRUE),
+                        na.rm = TRUE),
       .groups     = "drop"
     ) %>%
-    left_join(team_lookup, by="Pitcher") %>%
-    left_join(scores %>% select(Pitcher, `Stuff+`, `Location+`), by="Pitcher") %>%
+    left_join(team_lookup, by = "Pitcher") %>%
+    left_join(scores %>% select(Pitcher, `Stuff+`, `Location+`), by = "Pitcher") %>%
     filter(Pitches >= min_pitches) %>%
-    left_join(portal, by="Pitcher") %>%
+    left_join(portal %>% select(Pitcher, Portal), by = "Pitcher") %>%
     mutate(
-      Portal = ifelse(is.na(portal), "No", portal),
+      Portal      = ifelse(is.na(Portal), "No", as.character(Portal)),
       Name        = sapply(Pitcher, format_name),
       Team        = PitcherTeam,
       `Zone%`     = round(zone_n    / Pitches            * 100, 1),
@@ -137,13 +137,13 @@ build_pitcher_stats <- function(df, min_pitches, scores, portal) {
                            round(fb_velo_sum / fb_velo_n, 1)),
       `Hard Hit%` = round(hh_n      / pmax(bip_n,     1) * 100, 1),
       `Plot`      = paste0('<button class="plot-btn" data-pitcher="',
-                           gsub('"','&quot;',Pitcher),
+                           gsub('"', '&quot;', Pitcher),
                            '">&#128202; View</button>'),
       `Twitter`   = paste0('<a href="https://www.google.com/search?q=',
-                           gsub(" ","+",sapply(Pitcher, format_name)),
+                           gsub(" ", "+", sapply(Pitcher, format_name)),
                            '+baseball+twitter" target="_blank">&#x1F426; Search</a>')
     ) %>%
-    filter(!is.na(Name), trimws(Name)!="", grepl(" ",trimws(Name))) %>%
+    filter(!is.na(Name), trimws(Name) != "", grepl(" ", trimws(Name))) %>%
     select(Name, Level, Team, Pitches, Portal, `FB Velo`, `Zone%`, `Strike%`,
            `K's`, `BB's`, `K/BB`, `Whiff%`, `Chase%`, `Hard Hit%`,
            `Stuff+`, `Location+`, `Plot`, `Twitter`) %>%
@@ -199,6 +199,7 @@ ui <- fluidPage(
         background:#e8f0fe; border-radius:4px; padding:3px 8px; display:inline-block;
       }
       table.dataTable tbody td a:hover { background:#002147; color:white; }
+
       .portal-yes { color:#00840D; font-weight:700; }
       .portal-no  { color:#aaa;    font-weight:400; }
 
@@ -279,57 +280,57 @@ ui <- fluidPage(
   ),
 
   # splash
-  tags$div(id="splash",
-    tags$img(src="Butler-Bulldogs-Logo-1990.png"),
+  tags$div(id = "splash",
+    tags$img(src = "Butler-Bulldogs-Logo-1990.png"),
     tags$h1("Butler Baseball Transfer Portal"),
     tags$p("Butler Baseball Analytics"),
-    tags$div(class="bar-track", tags$div(class="bar-fill"))
+    tags$div(class = "bar-track", tags$div(class = "bar-fill"))
   ),
 
   # header
-  tags$div(class="header",
+  tags$div(class = "header",
     tags$div(
       tags$h1("Butler Baseball Transfer Portal Dashboard"),
       tags$p("Butler Baseball Analytics")
     ),
-    tags$img(src="Butler-Bulldogs-Logo-1990.png", height="52px")
+    tags$img(src = "Butler-Bulldogs-Logo-1990.png", height = "52px")
   ),
 
   # filters
-  tags$div(class="filters",
+  tags$div(class = "filters",
     tags$div(
-      tags$div("Level", class="filter-label"),
-      selectInput("level", label=NULL,
-                  choices=c("D1","D2","D3","JUCO","NAIA"),
-                  selected="D1", width="160px")
+      tags$div("Level", class = "filter-label"),
+      selectInput("level", label = NULL,
+                  choices  = c("D1","D2","D3","JUCO","NAIA"),
+                  selected = "D1", width = "160px")
     ),
     tags$div(
-      tags$div("Position", class="filter-label"),
-      selectInput("position", label=NULL,
-                  choices=c("Pitcher","Hitter"),
-                  selected="Pitcher", width="160px")
+      tags$div("Position", class = "filter-label"),
+      selectInput("position", label = NULL,
+                  choices  = c("Pitcher","Hitter"),
+                  selected = "Pitcher", width = "160px")
     ),
     tags$div(
-      tags$div("Min Pitches", class="filter-label"),
-      numericInput("min_pitches", label=NULL,
-                   value=100, min=1, max=2000, step=25, width="160px")
+      tags$div("Min Pitches", class = "filter-label"),
+      numericInput("min_pitches", label = NULL,
+                   value = 100, min = 1, max = 2000, step = 25, width = "160px")
     )
   ),
 
   # main
-  tags$div(class="main",
+  tags$div(class = "main",
     uiOutput("main_ui")
   ),
 
   # modal
   tags$div(
-    id="modal_wrapper", class="modal-overlay", style="display:none;",
+    id = "modal_wrapper", class = "modal-overlay", style = "display:none;",
     tags$div(
-      class="modal-box",
-      tags$button("✕", id="modal_close_btn", class="modal-close"),
+      class = "modal-box",
+      tags$button("✕", id = "modal_close_btn", class = "modal-close"),
       uiOutput("modal_header"),
-      plotOutput("movement_plot", height="400px"),
-      tags$div("Pitch Specifications", class="section-label"),
+      plotOutput("movement_plot", height = "400px"),
+      tags$div("Pitch Specifications", class = "section-label"),
       DTOutput("pitch_type_table")
     )
   )
@@ -347,7 +348,7 @@ server <- function(input, output, session) {
         portal = load_portal()
       )
     }, error = function(e) {
-      showNotification(paste("Failed to load:", e$message), type="error")
+      showNotification(paste("Failed to load:", e$message), type = "error")
       NULL
     })
   })
@@ -355,23 +356,30 @@ server <- function(input, output, session) {
   stats_table <- reactive({
     req(raw_data(), input$min_pitches)
     if (input$position == "Pitcher")
-      build_pitcher_stats(
-        raw_data()$df,
-        input$min_pitches,
-        raw_data()$scores,
-        raw_data()$portal
+      tryCatch(
+        build_pitcher_stats(
+          raw_data()$df,
+          input$min_pitches,
+          raw_data()$scores,
+          raw_data()$portal
+        ),
+        error = function(e) {
+          message("build_pitcher_stats failed: ", e$message)
+          showNotification(paste("Stats error:", e$message), type = "error")
+          NULL
+        }
       )
   })
 
   output$main_ui <- renderUI({
     if (input$position == "Pitcher") {
       tagList(
-        tags$p(id="loading_msg", "Loading data...",
-               style="color:#888; font-size:14px; padding:10px 0;"),
+        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;")
+      tags$p("Hitter view coming soon.", style = "color:#888;")
     }
   })
 
@@ -404,9 +412,9 @@ server <- function(input, output, session) {
         orderMulti  = FALSE,
         dom         = "lfrtip",
         columnDefs  = list(
-          list(className="dt-left",   targets=0:1),
-          list(className="dt-center", targets=2:17),
-          list(orderable=FALSE,       targets=c(16,17))
+          list(className = "dt-left",   targets = 0:1),
+          list(className = "dt-center", targets = 2:17),
+          list(orderable = FALSE,       targets = c(16, 17))
         ),
         initComplete = JS("function(settings, json) {
           $('#loading_msg').hide();
@@ -443,12 +451,12 @@ server <- function(input, output, session) {
   output$modal_header <- renderUI({
     req(current_pitcher())
     parts        <- strsplit(current_pitcher(), ", ")[[1]]
-    display_name <- if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else current_pitcher()
+    display_name <- if (length(parts) == 2) paste(trimws(parts[2]), trimws(parts[1])) else current_pitcher()
     pdata        <- pitcher_plot_data()
-    team         <- if (nrow(pdata)>0) pdata$PitcherTeam[1] else ""
+    team         <- if (nrow(pdata) > 0) pdata$PitcherTeam[1] else ""
     tagList(
-      tags$p(display_name, class="modal-title"),
-      tags$p(team,         class="modal-subtitle")
+      tags$p(display_name, class = "modal-title"),
+      tags$p(team,         class = "modal-subtitle")
     )
   })
 
@@ -456,40 +464,40 @@ server <- function(input, output, session) {
     req(pitcher_plot_data(), nrow(pitcher_plot_data()) > 0)
     pdata        <- pitcher_plot_data()
     parts        <- strsplit(current_pitcher(), ", ")[[1]]
-    display_name <- if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else current_pitcher()
+    display_name <- if (length(parts) == 2) paste(trimws(parts[2]), trimws(parts[1])) else current_pitcher()
 
     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"
+        HB   = mean(HorzBreak,        na.rm = TRUE),
+        iVB  = mean(InducedVertBreak, na.rm = TRUE),
+        Velo = round(mean(RelSpeed,   na.rm = TRUE), 1),
+        .groups = "drop"
       )
 
     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)") +
+      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"),
+        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")
+        legend.text     = element_text(size = 9),
+        legend.key.size = unit(0.4, "cm")
       )
   })
 
@@ -511,26 +519,26 @@ server <- function(input, output, session) {
         IsHardHit = !is.na(ExitSpeed) & ExitSpeed >= 95 &
           !PitchCall %in% c("FoulBall","FoulBallNotFieldable","FoulBallFieldable","FoulTip")
       ) %>%
-      group_by(`Pitch Type`=PitchType) %>%
+      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),
+        `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(`#`)) %>%
@@ -546,8 +554,8 @@ server <- function(input, output, session) {
         scrollX    = TRUE,
         ordering   = TRUE,
         columnDefs = list(
-          list(className="dt-center", targets=1:15),
-          list(className="dt-left",   targets=0)
+          list(className = "dt-center", targets = 1:15),
+          list(className = "dt-left",   targets = 0)
         )
       )
     )