Update app.R

app.R

@@ -760,12 +760,27 @@ calculate_leaderboards <- function(df, team_meta_df = team_meta) {
   }
 
   get_logo <- function(team_abbr) {
-    if (is.null(team_meta_df) || is.null(team_abbr) || is.na(team_abbr)) return("")
-    # Match BatterTeam/PitcherTeam to team_abbr in TMB
-    logo <- team_meta_df$BTeamLogo[team_meta_df$team_abbr == team_abbr]
-    if (length(logo) == 0 || is.na(logo[1])) return("")
-    logo[1]
-  }
+  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
+}
   
   # Game Info
   stadium <- if ("Stadium" %in% names(df)) unique(na.omit(df$Stadium))[1] else "Unknown"
@@ -773,21 +788,29 @@ calculate_leaderboards <- function(df, team_meta_df = team_meta) {
 
   league <- if ("League" %in% names(df)) unique(na.omit(df$League))[1] else ""
   
-  # Format date to MM/DD/YYYY
-  game_date <- if ("Date" %in% names(df)) {
-    raw_date <- unique(na.omit(df$Date))[1]
-    parsed <- tryCatch({
+game_date <- if ("Date" %in% names(df)) {
+  raw_date <- unique(na.omit(df$Date))[1]
+  parsed <- tryCatch({
+    # Handle if already a Date object
+    if (inherits(raw_date, "Date")) {
+      raw_date
+    } else {
+      raw_date <- as.character(raw_date)
       if (grepl("^\\d{4}-\\d{1,2}-\\d{1,2}", raw_date)) {
         as.Date(raw_date, format = "%Y-%m-%d")
       } else if (grepl("^\\d{1,2}/\\d{1,2}/\\d{4}", raw_date)) {
         as.Date(raw_date, format = "%m/%d/%Y")
+      } else if (grepl("^\\d{1,2}/\\d{1,2}/\\d{2}$", raw_date)) {
+        as.Date(raw_date, format = "%m/%d/%y")
       } else {
         as.Date(raw_date)
       }
-    }, error = function(e) Sys.Date())
-    format(parsed, "%m/%d/%Y")
-  } else format(Sys.Date(), "%m/%d/%Y")
+    }
+  }, error = function(e) NA)
   
+  if (is.na(parsed)) "N/A" else format(parsed, "%m/%d/%Y")
+} else "N/A"
+
   # Calculate final score from RunsScored
   teams <- unique(c(df$BatterTeam, df$PitcherTeam))
   teams <- teams[!is.na(teams)]