Update app.R

app.R

@@ -789,6 +789,30 @@ app_ui <- fluidPage(
       padding: 20px;
       margin-bottom: 15px;
     }
+    
+    /* Catcher notes styling */
+    .catcher-notes-input-box {
+      background: linear-gradient(135deg, #e8f4f8 0%, #f0e6d3 100%);
+      border: 2px solid darkcyan;
+      border-radius: 15px;
+      padding: 20px;
+    }
+    
+    .catcher-note-entry {
+      background: #fff;
+      border: 1px solid rgba(0,139,139,.15);
+      border-radius: 10px;
+      padding: 12px 16px;
+      margin-bottom: 8px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    
+    .catcher-note-entry:hover {
+      border-color: darkcyan;
+      box-shadow: 0 2px 8px rgba(0,139,139,.12);
+    }
   "))
   ),
   
@@ -957,7 +981,7 @@ app_ui <- fluidPage(
                   )
                 ),
                 
-                # ── NEW: Rule-Based Pitch Retagging Panel ──
+                # ── Rule-Based Pitch Retagging Panel ──
                 hr(),
                 fluidRow(
                   column(12,
@@ -1043,6 +1067,70 @@ app_ui <- fluidPage(
                 )
               ),
               
+              # ══════════════════════════════════════════════════════════════
+              # Catcher Notes Tab
+              # ══════════════════════════════════════════════════════════════
+              tabPanel(
+                "Catcher Notes",
+                fluidRow(
+                  column(5,
+                    div(class = "catcher-notes-input-box",
+                      h3("Add Catcher Note", style = "margin-top: 0; color: darkcyan; border-bottom: 2px solid darkcyan; padding-bottom: 8px;"),
+                      p(style = "color: #666; font-size: 13px; margin-bottom: 15px;",
+                        "Log catcher events (throws, wild pitches, passed balls). ",
+                        "Each note is matched to the pitch row by Catcher, Batter, Inning, and Count, ",
+                        "then written into a CatcherNotes column on download."),
+                      
+                      fluidRow(
+                        column(6, selectInput("cn_catcher", "Catcher:", choices = NULL)),
+                        column(6, selectInput("cn_batter", "Batter:", choices = NULL))
+                      ),
+                      
+                      fluidRow(
+                        column(4, numericInput("cn_inning", "Inning:", value = 1, min = 1, max = 20, step = 1)),
+                        column(4, numericInput("cn_balls", "Balls:", value = 0, min = 0, max = 3, step = 1)),
+                        column(4, numericInput("cn_strikes", "Strikes:", value = 0, min = 0, max = 2, step = 1))
+                      ),
+                      
+                      selectInput("cn_result", "Result:",
+                                  choices = c("2B Out", "2B Safe", "3B Out", "3B Safe",
+                                              "Wild Pitch", "Passed Ball",
+                                              "Pickoff Attempt", "Pickoff Out",
+                                              "Blocked Ball", "Other"),
+                                  selected = "2B Out"),
+                      
+                      conditionalPanel(
+                        condition = "input.cn_result == 'Other'",
+                        textInput("cn_custom_result", "Custom Note:", placeholder = "Describe the event...")
+                      ),
+                      
+                      br(),
+                      actionButton("cn_add_btn", "Add Note", class = "btn-success", 
+                                   style = "width: 100%; font-weight: bold; font-size: 15px;"),
+                      br(), br(),
+                      uiOutput("cn_match_feedback")
+                    )
+                  ),
+                  
+                  column(7,
+                    h3("Logged Catcher Notes"),
+                    p(style = "color: #666; font-size: 13px;",
+                      "These notes will be merged into the CatcherNotes column when you download the data."),
+                    DT::dataTableOutput("cn_notes_table"),
+                    br(),
+                    fluidRow(
+                      column(6,
+                        actionButton("cn_clear_all_btn", "Clear All Notes", class = "btn-danger",
+                                     style = "width: 100%;")
+                      ),
+                      column(6,
+                        verbatimTextOutput("cn_summary")
+                      )
+                    )
+                  )
+                )
+              ),
+              
               # Download Tab
               tabPanel(
                 "Download",
@@ -1168,9 +1256,21 @@ server <- function(input, output, session) {
   merge_result <- reactiveVal(NULL)
   scraped_data <- reactiveVal(NULL)
   scrape_polling <- reactiveVal(FALSE)
-
   scrape_status_msg <- reactiveVal("Ready.")
   
+  # Catcher Notes: stored as a list of data frames, each row is one note
+  catcher_notes_list <- reactiveVal(data.frame(
+    NoteID      = integer(0),
+    Catcher     = character(0),
+    Batter      = character(0),
+    Inning      = integer(0),
+    Balls       = integer(0),
+    Strikes     = integer(0),
+    Result      = character(0),
+    MatchedRow  = integer(0),
+    stringsAsFactors = FALSE
+  ))
+  
   # Handle column selection buttons
   observeEvent(input$select_all_cols, {
     updateCheckboxGroupInput(session, "columns_to_remove", 
@@ -1210,9 +1310,28 @@ server <- function(input, output, session) {
     processed_data(processed_df)
     plot_data(processed_df)
     
+    # Update catcher notes dropdowns
+    update_catcher_note_choices(processed_df)
+    
     return(processed_df)
   }
   
+  # Helper to populate Catcher Notes dropdowns from current data
+  update_catcher_note_choices <- function(df) {
+    if (!is.null(df)) {
+      if ("Catcher" %in% names(df)) {
+        catchers <- sort(unique(df$Catcher[!is.na(df$Catcher) & df$Catcher != ""]))
+        updateSelectInput(session, "cn_catcher", choices = catchers,
+                          selected = if (length(catchers) > 0) catchers[1] else NULL)
+      }
+      if ("Batter" %in% names(df)) {
+        batters <- sort(unique(df$Batter[!is.na(df$Batter) & df$Batter != ""]))
+        updateSelectInput(session, "cn_batter", choices = batters,
+                          selected = if (length(batters) > 0) batters[1] else NULL)
+      }
+    }
+  }
+  
   # Re-process data when date format changes
   observeEvent(input$date_format, {
     req(input$file)
@@ -1528,6 +1647,13 @@ server <- function(input, output, session) {
       "\u25CB Bat tracking: Not uploaded"
     }
     
+    notes <- catcher_notes_list()
+    notes_text <- if (nrow(notes) > 0) {
+      paste("\u2713 Catcher notes:", nrow(notes), "logged")
+    } else {
+      "\u25CB Catcher notes: None"
+    }
+    
     summary_text <- paste(
       paste0("\u2713 ", format_label, " file processed successfully!"),
       paste("\u2713 Original columns:", ncol(original_df)),
@@ -1535,6 +1661,7 @@ server <- function(input, output, session) {
       paste("\u2713 Rows processed:", nrow(df)),
       removed_cols_text,
       bat_tracking_text,
+      notes_text,
       "\u2713 Duplicates removed",
       paste("\u2713 Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
@@ -2107,6 +2234,272 @@ server <- function(input, output, session) {
   # End Rule-Based Retagging
   # ══════════════════════════════════════════════════════════════
   
+  # ══════════════════════════════════════════════════════════════
+  # Catcher Notes — Server Logic
+  # ══════════════════════════════════════════════════════════════
+  
+  # Add a catcher note
+  observeEvent(input$cn_add_btn, {
+    req(processed_data(), input$cn_catcher, input$cn_batter)
+    
+    df <- processed_data()
+    
+    # Determine the result text
+    result_text <- input$cn_result
+    if (result_text == "Other" && !is.null(input$cn_custom_result) && nzchar(trimws(input$cn_custom_result))) {
+      result_text <- trimws(input$cn_custom_result)
+    }
+    
+    # Find the matching row(s): Catcher + Batter + Inning + Balls + Strikes
+    # We match the LAST pitch in that count for that matchup in that inning
+    # (the event most likely happened on the final pitch of that count)
+    has_catcher <- "Catcher" %in% names(df)
+    has_batter  <- "Batter" %in% names(df)
+    has_inning  <- "Inning" %in% names(df)
+    has_balls   <- "Balls" %in% names(df)
+    has_strikes <- "Strikes" %in% names(df)
+    
+    candidates <- df
+    if (has_catcher) candidates <- candidates %>% filter(Catcher == input$cn_catcher)
+    if (has_batter)  candidates <- candidates %>% filter(Batter == input$cn_batter)
+    if (has_inning)  candidates <- candidates %>% filter(Inning == input$cn_inning)
+    if (has_balls)   candidates <- candidates %>% filter(Balls == input$cn_balls)
+    if (has_strikes) candidates <- candidates %>% filter(Strikes == input$cn_strikes)
+    
+    # Get the row index in the full dataframe for the last matching pitch
+    if (nrow(candidates) > 0) {
+      # Find which rows in the full df match
+      match_idx <- which(
+        (if (has_catcher) df$Catcher == input$cn_catcher else TRUE) &
+        (if (has_batter)  df$Batter == input$cn_batter else TRUE) &
+        (if (has_inning)  df$Inning == input$cn_inning else TRUE) &
+        (if (has_balls)   df$Balls == input$cn_balls else TRUE) &
+        (if (has_strikes) df$Strikes == input$cn_strikes else TRUE)
+      )
+      matched_row <- max(match_idx)  # last pitch at that count
+    } else {
+      matched_row <- NA_integer_
+    }
+    
+    # Build the new note
+    notes <- catcher_notes_list()
+    new_id <- if (nrow(notes) == 0) 1L else max(notes$NoteID) + 1L
+    
+    new_note <- data.frame(
+      NoteID     = new_id,
+      Catcher    = input$cn_catcher,
+      Batter     = input$cn_batter,
+      Inning     = as.integer(input$cn_inning),
+      Balls      = as.integer(input$cn_balls),
+      Strikes    = as.integer(input$cn_strikes),
+      Result     = result_text,
+      MatchedRow = matched_row,
+      stringsAsFactors = FALSE
+    )
+    
+    catcher_notes_list(bind_rows(notes, new_note))
+    
+    # Show match feedback
+    output$cn_match_feedback <- renderUI({
+      if (!is.na(matched_row)) {
+        pitch_info <- df[matched_row, ]
+        detail_parts <- c()
+        if ("PitchNo" %in% names(pitch_info) && !is.na(pitch_info$PitchNo)) 
+          detail_parts <- c(detail_parts, paste("Pitch #", pitch_info$PitchNo))
+        if ("PitchCall" %in% names(pitch_info) && !is.na(pitch_info$PitchCall))
+          detail_parts <- c(detail_parts, pitch_info$PitchCall)
+        if ("Pitcher" %in% names(pitch_info) && !is.na(pitch_info$Pitcher))
+          detail_parts <- c(detail_parts, paste("vs", pitch_info$Pitcher))
+        
+        div(class = "merge-status-box merge-success",
+            style = "margin-top: 10px;",
+            p(style = "margin: 0; font-weight: 600; color: #155724;",
+              paste0("\u2713 Matched to row ", matched_row)),
+            if (length(detail_parts) > 0) 
+              p(style = "margin: 4px 0 0 0; color: #155724; font-size: 13px;",
+                paste(detail_parts, collapse = " | "))
+        )
+      } else {
+        div(class = "merge-status-box merge-warning",
+            style = "margin-top: 10px;",
+            p(style = "margin: 0; font-weight: 600; color: #856404;",
+              paste0("\u26A0 No matching pitch found for ", input$cn_catcher,
+                     " / ", input$cn_batter, " / Inn ", input$cn_inning,
+                     " / ", input$cn_balls, "-", input$cn_strikes)),
+            p(style = "margin: 4px 0 0 0; color: #856404; font-size: 13px;",
+              "Note saved anyway \u2014 it will appear in CatcherNotes column as unmatched.")
+        )
+      }
+    })
+    
+    showNotification(
+      paste0("Added: ", result_text, " (", input$cn_catcher, " / ", input$cn_batter, 
+             " / Inn ", input$cn_inning, " / ", input$cn_balls, "-", input$cn_strikes, ")"),
+      type = "message", duration = 3
+    )
+  })
+  
+  # Render the notes table
+  output$cn_notes_table <- DT::renderDataTable({
+    notes <- catcher_notes_list()
+    if (nrow(notes) == 0) return(NULL)
+    
+    display_notes <- notes %>%
+      mutate(
+        Count = paste0(Balls, "-", Strikes),
+        Match = ifelse(is.na(MatchedRow), "\u2717 No match", paste0("\u2713 Row ", MatchedRow))
+      ) %>%
+      select(NoteID, Catcher, Batter, Inning, Count, Result, Match)
+    
+    DT::datatable(
+      display_notes,
+      options = list(
+        scrollX = TRUE, pageLength = 15, dom = "tip",
+        columnDefs = list(list(className = "dt-center", targets = "_all"))
+      ),
+      rownames = FALSE,
+      selection = "single",
+      callback = DT::JS("
+        table.on('click', 'tr', function() {
+          var data = table.row(this).data();
+          if (data) {
+            Shiny.setInputValue('cn_delete_row', data[0], {priority: 'event'});
+          }
+        });
+      ")
+    ) %>%
+      DT::formatStyle("Match",
+        color = DT::styleEqual(c("\u2717 No match"), c("#dc3545")),
+        fontWeight = "bold"
+      )
+  })
+  
+  # Delete a single note by clicking its row
+  observeEvent(input$cn_delete_row, {
+    notes <- catcher_notes_list()
+    note_id <- as.integer(input$cn_delete_row)
+    
+    if (note_id %in% notes$NoteID) {
+      showModal(modalDialog(
+        title = "Delete Catcher Note?",
+        p(paste("Remove note #", note_id, "?")),
+        footer = tagList(
+          actionButton("cn_confirm_delete", "Delete", class = "btn-danger"),
+          modalButton("Cancel")
+        ),
+        size = "s", easyClose = TRUE
+      ))
+    }
+  })
+  
+  observeEvent(input$cn_confirm_delete, {
+    notes <- catcher_notes_list()
+    note_id <- as.integer(input$cn_delete_row)
+    catcher_notes_list(notes %>% filter(NoteID != note_id))
+    removeModal()
+    showNotification(paste("Deleted note #", note_id), type = "message", duration = 2)
+  })
+  
+  # Clear all notes
+  observeEvent(input$cn_clear_all_btn, {
+    showModal(modalDialog(
+      title = "Clear All Catcher Notes?",
+      p("This will remove all logged catcher notes. This cannot be undone."),
+      footer = tagList(
+        actionButton("cn_confirm_clear_all", "Clear All", class = "btn-danger"),
+        modalButton("Cancel")
+      ),
+      size = "s", easyClose = TRUE
+    ))
+  })
+  
+  observeEvent(input$cn_confirm_clear_all, {
+    catcher_notes_list(data.frame(
+      NoteID = integer(0), Catcher = character(0), Batter = character(0),
+      Inning = integer(0), Balls = integer(0), Strikes = integer(0),
+      Result = character(0), MatchedRow = integer(0), stringsAsFactors = FALSE
+    ))
+    removeModal()
+    output$cn_match_feedback <- renderUI({ NULL })
+    showNotification("All catcher notes cleared.", type = "message", duration = 2)
+  })
+  
+  # Catcher notes summary
+  output$cn_summary <- renderText({
+    notes <- catcher_notes_list()
+    if (nrow(notes) == 0) return("No notes logged yet.")
+    
+    n_matched <- sum(!is.na(notes$MatchedRow))
+    n_unmatched <- sum(is.na(notes$MatchedRow))
+    result_counts <- table(notes$Result)
+    result_str <- paste(names(result_counts), "(", result_counts, ")", collapse = ", ")
+    
+    paste(
+      paste("Total notes:", nrow(notes)),
+      paste("Matched:", n_matched, "| Unmatched:", n_unmatched),
+      paste("Results:", result_str),
+      sep = "\n"
+    )
+  })
+  
+  # ══════════════════════════════════════════════════════════════
+  # Helper: merge catcher notes into data for download
+  # ══════════════════════════════════════════════════════════════
+  
+  build_download_data <- function() {
+    df <- processed_data()
+    if (is.null(df)) return(NULL)
+    
+    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_
+    }
+    
+    # For each note, write the result into the matched row
+    # If multiple notes match the same row, concatenate with " | "
+    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]
+        if (is.na(existing) || existing == "") {
+          df$CatcherNotes[row_idx] <- result
+        } else {
+          df$CatcherNotes[row_idx] <- paste(existing, result, sep = " | ")
+        }
+      }
+    }
+    
+    # Also add unmatched notes as a summary attribute (append to last row as a note)
+    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]
+      unmatched_str <- paste0("[UNMATCHED] ", paste(unmatched_texts, collapse = "; "))
+      if (is.na(existing) || existing == "") {
+        df$CatcherNotes[last_row] <- unmatched_str
+      } else {
+        df$CatcherNotes[last_row] <- paste(existing, unmatched_str, sep = " | ")
+      }
+    }
+    
+    return(df)
+  }
+  
+  # ══════════════════════════════════════════════════════════════
+  # End Catcher Notes
+  # ══════════════════════════════════════════════════════════════
+  
   # Click info output
   output$click_info <- renderText({
     if (!is.null(selected_pitch())) {
@@ -2124,6 +2517,7 @@ server <- function(input, output, session) {
     req(processed_data())
     df <- processed_data()
     result <- merge_result()
+    notes <- catcher_notes_list()
     
     bat_tracking_summary <- if (!is.null(result) && result$matched > 0) {
       paste("Bat tracking data:", result$matched, "pitches with swing metrics")
@@ -2131,6 +2525,13 @@ server <- function(input, output, session) {
       "Bat tracking data: None"
     }
     
+    notes_summary <- if (nrow(notes) > 0) {
+      n_matched <- sum(!is.na(notes$MatchedRow))
+      paste0("Catcher notes: ", nrow(notes), " total (", n_matched, " matched to rows)")
+    } else {
+      "Catcher notes: None"
+    }
+    
     summary_text <- paste(
       paste("Total rows:", nrow(df)),
       paste("Total columns:", ncol(df)),
@@ -2153,6 +2554,7 @@ server <- function(input, output, session) {
               "TaggedPitchType column not available"
             }),
       bat_tracking_summary,
+      notes_summary,
       paste("Source format:", toupper(uploaded_file_type())),
       paste("Date format:", if (input$date_format == "mdyy") "M/D/YY" else "YYYY-MM-DD"),
       sep = "\n"
@@ -2161,7 +2563,7 @@ server <- function(input, output, session) {
     return(summary_text)
   })
   
-  # Download handler: CSV or Parquet with custom filename
+  # Download handler: CSV or Parquet with custom filename — NOW includes catcher notes
   output$downloadData <- downloadHandler(
     filename = function() {
       base_name <- gsub("[^A-Za-z0-9_\\-]", "_", input$download_filename)
@@ -2171,10 +2573,12 @@ server <- function(input, output, session) {
       paste0(base_name, ".", ext)
     },
     content = function(file) {
+      download_df <- build_download_data()
+      
       if (input$download_format == "parquet") {
-        arrow::write_parquet(processed_data(), file)
+        arrow::write_parquet(download_df, file)
       } else {
-        write.csv(processed_data(), file, row.names = FALSE)
+        write.csv(download_df, file, row.names = FALSE)
       }
     }
   )