Update app.R

app.R

@@ -40,8 +40,10 @@ pitch_colors <- c(
   "Other" = "#D3D3D3"
 )
 
-# Function to convert date formats (MM/DD/YYYY or M/D/YYYY to YYYY-MM-DD)
-convert_date_format <- function(date_string) {
+# Function to convert date formats
+# input_string: the date string to convert
+# output_format: "yyyy" for YYYY-MM-DD or "mdyy" for M/D/YY
+convert_date_format <- function(date_string, output_format = "yyyy") {
   if (is.na(date_string) || date_string == "") {
     return(NA)
   }
@@ -49,18 +51,38 @@ convert_date_format <- function(date_string) {
   # Convert to character if not already
   date_string <- as.character(date_string)
   
-  # Check if already in YYYY-MM-DD format
+  parsed_date <- NULL
+  
+  # Try to parse YYYY-MM-DD format
   if (grepl("^\\d{4}-\\d{2}-\\d{2}$", date_string)) {
-    return(date_string)
+    parsed_date <- tryCatch({
+      as.Date(date_string, format = "%Y-%m-%d")
+    }, error = function(e) NULL)
   }
   
   # Try to parse MM/DD/YYYY or M/D/YYYY format
-  if (grepl("^\\d{1,2}/\\d{1,2}/\\d{4}$", date_string)) {
+  if (is.null(parsed_date) && grepl("^\\d{1,2}/\\d{1,2}/\\d{4}$", date_string)) {
     parsed_date <- tryCatch({
       as.Date(date_string, format = "%m/%d/%Y")
-    }, error = function(e) NA)
-    
-    if (!is.na(parsed_date)) {
+    }, error = function(e) NULL)
+  }
+  
+  # Try to parse MM/DD/YY or M/D/YY format
+  if (is.null(parsed_date) && grepl("^\\d{1,2}/\\d{1,2}/\\d{2}$", date_string)) {
+    parsed_date <- tryCatch({
+      as.Date(date_string, format = "%m/%d/%y")
+    }, error = function(e) NULL)
+  }
+  
+  # If we successfully parsed a date, format it according to output_format
+  if (!is.null(parsed_date) && !is.na(parsed_date)) {
+    if (output_format == "mdyy") {
+      # M/D/YY format (no leading zeros, 2-digit year)
+      return(format(parsed_date, "%m/%d/%y") %>% 
+               gsub("^0", "", .) %>%  # Remove leading zero from month
+               gsub("/0", "/", .))     # Remove leading zero from day
+    } else {
+      # YYYY-MM-DD format
       return(format(parsed_date, "%Y-%m-%d"))
     }
   }
@@ -70,13 +92,13 @@ convert_date_format <- function(date_string) {
 }
 
 # Function to convert date columns in a dataframe
-convert_date_columns <- function(df) {
+convert_date_columns <- function(df, output_format = "yyyy") {
   # Common date column names in TrackMan data
   date_columns <- c("Date", "GameDate", "UTCDate", "LocalDateTime")
   
   for (col in date_columns) {
     if (col %in% names(df)) {
-      df[[col]] <- sapply(df[[col]], convert_date_format, USE.NAMES = FALSE)
+      df[[col]] <- sapply(df[[col]], function(x) convert_date_format(x, output_format), USE.NAMES = FALSE)
     }
   }
   
@@ -443,18 +465,23 @@ ui <- fluidPage(
                          h3("1. Upload TrackMan CSV"),
                          fileInput("file", "Choose CSV File", accept = c(".csv")),
                          fluidRow(
-                           column(4,
+                           column(3,
                                   checkboxInput("header", "Header", TRUE)
                            ),
-                           column(4,
+                           column(3,
                                   radioButtons("sep", "Separator",
                                                choices = c(Comma = ",", Semicolon = ";", Tab = "\t"),
                                                selected = ",", inline = TRUE)
                            ),
-                           column(4,
+                           column(3,
                                   radioButtons("quote", "Quote",
                                                choices = c(None = "", "Double Quote" = '"', "Single Quote" = "'"),
                                                selected = '"', inline = TRUE)
+                           ),
+                           column(3,
+                                  radioButtons("date_format", "Date Output Format",
+                                               choices = c("YYYY-MM-DD" = "yyyy", "M/D/YY" = "mdyy"),
+                                               selected = "yyyy")
                            )
                          ),
                          verbatimTextOutput("csv_status")
@@ -645,6 +672,56 @@ server <- function(input, output, session) {
     updateCheckboxGroupInput(session, "columns_to_remove", selected = spinaxis_cols)
   })
   
+  # Re-process data when date format changes
+  observeEvent(input$date_format, {
+    req(input$file)  # Only run if a file has been uploaded
+    
+    # Re-read and process the CSV with new date format
+    tryCatch({
+      df <- read.csv(input$file$datapath,
+                     header = input$header,
+                     sep = input$sep,
+                     quote = input$quote,
+                     stringsAsFactors = FALSE)
+      
+      # Auto-convert date formats based on user selection
+      df <- convert_date_columns(df, input$date_format)
+      
+      csv_data_raw(df)
+      
+      # If we already have bat tracking data, try to merge
+      if (!is.null(bat_tracking_parsed()) && !is.null(bat_tracking_parsed()$data)) {
+        result <- merge_with_bat_tracking(df, bat_tracking_parsed()$data)
+        merge_result(result)
+        df <- result$data
+      }
+      
+      # Process the data (remove columns)
+      selected_cols_to_remove <- input$columns_to_remove %||% character(0)
+      processed_df <- df
+      
+      if (length(selected_cols_to_remove) > 0) {
+        columns_to_drop <- intersect(names(df), selected_cols_to_remove)
+        if (length(columns_to_drop) > 0) {
+          processed_df <- processed_df %>% select(-all_of(columns_to_drop))
+        }
+      }
+      
+      processed_df <- processed_df %>% distinct()
+      
+      processed_data(processed_df)
+      plot_data(processed_df)
+      
+      showNotification(
+        paste("Date format updated to:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
+        type = "message", duration = 3
+      )
+      
+    }, error = function(e) {
+      showNotification(paste("Error updating date format:", e$message), type = "error")
+    })
+  }, ignoreInit = TRUE)
+  
   # Process uploaded CSV file
   observeEvent(input$file, {
     req(input$file)
@@ -656,8 +733,8 @@ server <- function(input, output, session) {
                      quote = input$quote,
                      stringsAsFactors = FALSE)
       
-      # Auto-convert date formats (MM/DD/YYYY to YYYY-MM-DD)
-      df <- convert_date_columns(df)
+      # Auto-convert date formats based on user selection
+      df <- convert_date_columns(df, input$date_format)
       
       csv_data_raw(df)
       
@@ -744,13 +821,14 @@ server <- function(input, output, session) {
     
     df <- csv_data_raw()
     game_id <- if ("GameID" %in% names(df)) unique(df$GameID)[1] else "Unknown"
+    date_fmt <- if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"
     
     paste(
       "✓ CSV loaded successfully!",
       paste("  Game ID:", game_id),
       paste("  Rows:", nrow(df)),
       paste("  Columns:", ncol(df)),
-      "✓ Date formats auto-converted (MM/DD/YYYY → YYYY-MM-DD)",
+      paste("✓ Date format:", date_fmt),
       sep = "\n"
     )
   })
@@ -965,7 +1043,7 @@ server <- function(input, output, session) {
       removed_cols_text,
       bat_tracking_text,
       "✓ Duplicates removed",
-      "✓ Dates converted to YYYY-MM-DD",
+      paste("✓ Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
     )
     
@@ -1378,7 +1456,7 @@ server <- function(input, output, session) {
               "TaggedPitchType column not available"
             }),
       bat_tracking_summary,
-      "Date format: YYYY-MM-DD (auto-converted)",
+      paste("Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
     )