Update app.R

app.R

@@ -753,34 +753,34 @@ create_report_contact_chart <- function(game_data, player_name) {
 
 calculate_leaderboards <- function(df, team_meta_df = team_meta) {
   
-  # Helper to format names from "Last, First" to "First Last"
   format_name <- function(name) {
     if (is.na(name)) return(name)
     stringr::str_replace(name, "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1")
   }
 
   get_logo <- function(team_abbr) {
-  if (is.null(team_meta_df) || is.null(team_abbr) || is.na(team_abbr) || team_abbr == "") return("")
-  # Try exact match first
-
-  idx <- which(team_meta_df$team_abbr == team_abbr)
-  if (length(idx) > 0) return(team_meta_df$BTeamLogo[idx[1]])
-  # Try case-insensitive match
-  idx <- which(tolower(team_meta_df$team_abbr) == tolower(team_abbr))
-  if (length(idx) > 0) return(team_meta_df$BTeamLogo[idx[1]])
-  ""
-}
-
-get_team_name <- function(abbr) {
-  if (is.null(team_meta_df) || is.null(abbr) || is.na(abbr) || abbr == "") return(abbr)
-  # Try exact match first
-  idx <- which(team_meta_df$team_abbr == abbr)
-  if (length(idx) > 0) return(team_meta_df$BTeamName[idx[1]])
-  # Try case-insensitive match
-  idx <- which(tolower(team_meta_df$team_abbr) == tolower(abbr))
-  if (length(idx) > 0) return(team_meta_df$BTeamName[idx[1]])
-  abbr
-}
+    if (is.null(team_meta_df) || is.null(team_abbr) || is.na(team_abbr)) return("")
+    team_abbr <- trimws(as.character(team_abbr))
+    if (team_abbr == "") return("")
+    tmb_abbrs <- trimws(as.character(team_meta_df$team_abbr))
+    idx <- which(tmb_abbrs == team_abbr)
+    if (length(idx) > 0) return(team_meta_df$BTeamLogo[idx[1]])
+    idx <- which(tolower(tmb_abbrs) == tolower(team_abbr))
+    if (length(idx) > 0) return(team_meta_df$BTeamLogo[idx[1]])
+    ""
+  }
+  
+  get_team_name <- function(abbr) {
+    if (is.null(team_meta_df) || is.null(abbr) || is.na(abbr)) return(as.character(abbr))
+    abbr <- trimws(as.character(abbr))
+    if (abbr == "") return(abbr)
+    tmb_abbrs <- trimws(as.character(team_meta_df$team_abbr))
+    idx <- which(tmb_abbrs == abbr)
+    if (length(idx) > 0) return(team_meta_df$BTeamName[idx[1]])
+    idx <- which(tolower(tmb_abbrs) == tolower(abbr))
+    if (length(idx) > 0) return(team_meta_df$BTeamName[idx[1]])
+    abbr
+  }
   
   # Game Info
   stadium <- if ("Stadium" %in% names(df)) unique(na.omit(df$Stadium))[1] else "Unknown"
@@ -827,13 +827,6 @@ game_date <- if ("Date" %in% names(df)) {
     team2 <- score_info$BatterTeam[2]
     runs2 <- score_info$Runs[2]
     
-    # Get team names from TMB if available
-    get_team_name <- function(abbr) {
-      if (is.null(team_meta_df)) return(abbr)
-      name <- team_meta_df$BTeamName[team_meta_df$team_abbr == abbr]
-      if (length(name) == 0 || is.na(name[1])) return(abbr)
-      name[1]
-    }
     
     final_score <- paste0(get_team_name(team1), " ", runs1, " - ", 
                           get_team_name(team2), " ", runs2)