Update app.R

app.R

@@ -1131,7 +1131,6 @@ app_ui <- fluidPage(
                 )
               ),
               
-              # Download Tab
               tabPanel(
                 "Download",
                 fluidRow(
@@ -1139,6 +1138,33 @@ app_ui <- fluidPage(
                          h3("Download Processed Data"),
                          
                          div(class = "download-option-box",
+                           h4("Processing Mode", style = "color: darkcyan; margin-top: 0;"),
+                           radioButtons("download_mode", NULL,
+                                        choices = c(
+                                          "Raw Edited CSV (as-is)" = "raw",
+                                          "Full Processing (clean + indicators + Stuff+)" = "full"
+                                        ),
+                                        selected = "raw", inline = TRUE),
+                           conditionalPanel(
+                             condition = "input.download_mode == 'full'",
+                             div(style = "background: #d4edda; border-left: 4px solid #28a745; padding: 12px; border-radius: 0 8px 8px 0; margin: 10px 0;",
+                               p(style = "margin: 0; color: #155724; font-size: 13px;",
+                                 tags$b("Full Processing will:"), 
+                                 "Normalize names & pitch types, convert PlateLocHeight/Side to inches, ",
+                                 "add swing/whiff/chase/zone flags, compute wOBA/SLG/OBP indicators, ",
+                                 "join run values, predict Stuff+, and trim to ~140 columns.")
+                             )
+                           ),
+                           conditionalPanel(
+                             condition = "input.download_mode == 'raw'",
+                             div(style = "background: #e8f4f8; border-left: 4px solid darkcyan; padding: 12px; border-radius: 0 8px 8px 0; margin: 10px 0;",
+                               p(style = "margin: 0; color: #006F71; font-size: 13px;",
+                                 tags$b("Raw Edited:"), 
+                                 "Downloads your current data with any pitch retags, column removals, ",
+                                 "bat tracking merges, and catcher notes applied — no additional processing.")
+                             )
+                           ),
+                           hr(),
                            fluidRow(
                              column(5,
                                     textInput("download_filename", "File Name (without extension):",
@@ -2441,60 +2467,76 @@ server <- function(input, output, session) {
       sep = "\n"
     )
   })
-  
-  # ══════════════════════════════════════════════════════════════
-  # Helper: merge catcher notes into data for download
-  # ══════════════════════════════════════════════════════════════
-  
+
   build_download_data <- function() {
     df <- processed_data()
     if (is.null(df)) return(NULL)
     
+    # ── Full processing mode: clean + stuff+ ──
+    if (!is.null(input$download_mode) && input$download_mode == "full") {
+      df <- tryCatch({
+        showNotification("Running clean_college_data()...", type = "message", duration = 2)
+        cleaned <- clean_college_data(df)
+        
+        showNotification("Predicting Stuff+...", type = "message", duration = 2)
+        cleaned <- predict_stuffplus(cleaned)
+        
+        showNotification(
+          paste0("Full processing complete: ", nrow(cleaned), " rows × ", ncol(cleaned), " columns"),
+          type = "message", duration = 4
+        )
+        cleaned
+      }, error = function(e) {
+        showNotification(paste("Processing error:", e$message), type = "error", duration = 8)
+        processed_data()
+      })
+    }
+    
+    # ── Merge catcher notes into existing Notes column ──
     notes <- catcher_notes_list()
     
     if (nrow(notes) == 0) return(df)
     
-    # Initialize CatcherNotes column if not present
-    if (!"CatcherNotes" %in% names(df)) {
-      df$CatcherNotes <- NA_character_
+    # Initialize Notes column if not present
+    if (!"Notes" %in% names(df)) {
+      df$Notes <- NA_character_
     }
     
-    # For each note, write the result into the matched row
-    # If multiple notes match the same row, concatenate with " | "
+    # For each note, append the result into the matched row's Notes
     for (i in seq_len(nrow(notes))) {
       row_idx <- notes$MatchedRow[i]
       result  <- notes$Result[i]
       
       if (!is.na(row_idx) && row_idx >= 1 && row_idx <= nrow(df)) {
-        existing <- df$CatcherNotes[row_idx]
+        existing <- df$Notes[row_idx]
         if (is.na(existing) || existing == "") {
-          df$CatcherNotes[row_idx] <- result
+          df$Notes[row_idx] <- result
         } else {
-          df$CatcherNotes[row_idx] <- paste(existing, result, sep = " | ")
+          df$Notes[row_idx] <- paste(existing, result, sep = " | ")
         }
       }
     }
     
-    # Also add unmatched notes as a summary attribute (append to last row as a note)
+    # Append unmatched notes to last row
     unmatched <- notes %>% filter(is.na(MatchedRow))
     if (nrow(unmatched) > 0) {
       unmatched_texts <- paste0(
         unmatched$Result, " (", unmatched$Catcher, "/", unmatched$Batter,
         " Inn", unmatched$Inning, " ", unmatched$Balls, "-", unmatched$Strikes, ")"
       )
-      # Put unmatched notes in the last row's CatcherNotes with a prefix
       last_row <- nrow(df)
-      existing <- df$CatcherNotes[last_row]
+      existing <- df$Notes[last_row]
       unmatched_str <- paste0("[UNMATCHED] ", paste(unmatched_texts, collapse = "; "))
       if (is.na(existing) || existing == "") {
-        df$CatcherNotes[last_row] <- unmatched_str
+        df$Notes[last_row] <- unmatched_str
       } else {
-        df$CatcherNotes[last_row] <- paste(existing, unmatched_str, sep = " | ")
+        df$Notes[last_row] <- paste(existing, unmatched_str, sep = " | ")
       }
     }
     
     return(df)
   }
+
   
   # ══════════════════════════════════════════════════════════════
   # End Catcher Notes