Update app.R

app.R

@@ -163,7 +163,6 @@ app_css <- "
 }
 "
 
-
 stuffplus_recipe <- readRDS("stuffplus_recipe.rds")
 
 stuffplus_model <- xgb.load("stuffplus_xgb.json")
@@ -5783,63 +5782,128 @@ app_ui <- fluidPage(
       p("Upload a Trackman CSV to generate postgame reports | To generate a bullpen report first select the bullpen option then upload a portable trackman CSV")
   ),
   uiOutput("leaderboard_ui"),
-  fluidRow(
-    column(
-      4,
-      div(class = "main-panel",
-          div(class = "upload-box",
-              h3("Upload Game Data", style = "color: #006F71; margin-top: 0;"),
-              radioButtons("report_type", "Report Type", 
-                           c("Hitter Report"="hitter",
-                             "Camp Pitcher Report"="pitcher",
-                             "Isaac Pitcher Report"="advanced_pitcher",
-                             "Matt Williams Report"="tableau_pitcher",
-                             "Catcher Report"="catcher",
-                             "Umpire Report"="umpire",
-                             "BP Report"="bp",
-                             "Bullpen Report (Portable) "="bullpen"),
-                           selected = "hitter", inline = TRUE),
+  tabsetPanel(
+    id = "main_tabs",
+    tabPanel("Generate Reports",
+      br(),
+    fluidRow(
+        column(
+          4,
+          div(class = "main-panel",
+              div(class = "upload-box",
+                  h3("Upload Game Data", style = "color: #006F71; margin-top: 0;"),
+                  radioButtons("report_type", "Report Type", 
+                               c("Hitter Report"="hitter",
+                                 "Camp Pitcher Report"="pitcher",
+                                 "Isaac Pitcher Report"="advanced_pitcher",
+                                 "Matt Williams Report"="tableau_pitcher",
+                                 "Catcher Report"="catcher",
+                                 "Umpire Report"="umpire",
+                                 "BP Report"="bp",
+                                 "Bullpen Report (Portable) "="bullpen"),
+                               selected = "hitter", inline = TRUE),
               
-              conditionalPanel(
-                condition = "input.report_type != 'bullpen'",
-                fileInput("game_csv", NULL, accept = c(".csv","text/csv"),
-                          buttonLabel = "Choose Game CSV...", placeholder = "No file selected")
-              ),
+                  conditionalPanel(
+                    condition = "input.report_type != 'bullpen'",
+                    fileInput("game_csv", NULL, accept = c(".csv","text/csv"),
+                              buttonLabel = "Choose Game CSV...", placeholder = "No file selected")
+                  ),
               
-              conditionalPanel(
-                condition = "input.report_type == 'bullpen'",
-                fileInput("bullpen_csv", "Bullpen CSV", accept = c(".csv","text/csv"),
-                          buttonLabel = "Choose Bullpen CSV...", placeholder = "Upload bullpen pitching data"),
-                p("Upload a bullpen-session TrackMan CSV (no game data needed)",
-                  style = "font-size: 0.85em; color: #666; margin-top: -10px;")
-              ),
+                  conditionalPanel(
+                    condition = "input.report_type == 'bullpen'",
+                    fileInput("bullpen_csv", "Bullpen CSV", accept = c(".csv","text/csv"),
+                              buttonLabel = "Choose Bullpen CSV...", placeholder = "Upload bullpen pitching data"),
+                    p("Upload a bullpen-session TrackMan CSV (no game data needed)",
+                      style = "font-size: 0.85em; color: #666; margin-top: -10px;")
+                  ),
               
-              hr(),
-              h4("Optional: Bio CSV", style = "color: #006F71; font-size: 1em;"),
-              conditionalPanel("input.report_type == 'hitter'",
-                               fileInput("bio_csv_hitter", "Player Bio (optional)", accept = c(".csv","text/csv"),
-                                         buttonLabel = "Choose Bio CSV...", placeholder = "Optional"),
-                               p("Upload CCU_Hitter_Bio.csv to add headshots",
-                                 style = "font-size: 0.85em; color: #666; margin-top: -10px;")
+                  hr(),
+                  h4("Optional: Bio CSV", style = "color: #006F71; font-size: 1em;"),
+                  conditionalPanel("input.report_type == 'hitter'",
+                                   fileInput("bio_csv_hitter", "Player Bio (optional)", accept = c(".csv","text/csv"),
+                                             buttonLabel = "Choose Bio CSV...", placeholder = "Optional"),
+                                   p("Upload CCU_Hitter_Bio.csv to add headshots",
+                                     style = "font-size: 0.85em; color: #666; margin-top: -10px;")
+                  ),
+                  conditionalPanel("input.report_type == 'catcher'",
+                                   fileInput("bio_csv_catcher", "Catcher Bio (optional)", accept = c(".csv","text/csv"),
+                                             buttonLabel = "Choose Bio CSV...", placeholder = "Optional")
+                  )
               ),
-              conditionalPanel("input.report_type == 'catcher'",
-                               fileInput("bio_csv_catcher", "Catcher Bio (optional)", accept = c(".csv","text/csv"),
-                                         buttonLabel = "Choose Bio CSV...", placeholder = "Optional")
-              )
-          ),
-          uiOutput("selector_ui"),
-          hr(),
-          uiOutput("download_ui"),
-          uiOutput("bulk_ui"),
-          uiOutput("status_message")
+              uiOutput("selector_ui"),
+              hr(),
+              uiOutput("download_ui"),
+              uiOutput("bulk_ui"),
+              uiOutput("status_message")
+          )
+        ),
+        column(
+          8,
+          div(class = "main-panel",
+              h3("Report Preview", style = "color: #006F71; margin-top: 0;"),
+              uiOutput("preview_content")
+          )
+        )
       )
     ),
-    column(
-      8,
-      div(class = "main-panel",
-          h3("Report Preview", style = "color: #006F71; margin-top: 0;"),
-          uiOutput("preview_content")
-      )
+    tabPanel("Data Processing",
+      br(),
+    fluidRow(
+          column(
+            4,
+            div(class = "main-panel",
+                div(class = "upload-box",
+                    h3("Process Raw TrackMan Data", style = "color: #006F71; margin-top: 0;"),
+                    p("Clean a raw TrackMan export (add result metrics, run values) and optionally append Stuff+, then download the processed dataset for use in the report tabs.",
+                      style = "font-size: 0.85em; color: #666;"),
+                    fileInput("proc_file", "Game Data (CSV or Parquet)",
+                              accept = c(".csv", "text/csv", ".parquet"),
+                              buttonLabel = "Choose File...", placeholder = "No file selected"),
+                    fileInput("proc_json", "Bat Tracking JSON (optional)",
+                              accept = c(".json", "application/json"),
+                              buttonLabel = "Choose JSON...", placeholder = "Optional - merged by PitchUID"),
+                    radioButtons("proc_date_format", "Date Format",
+                                 c("YYYY-MM-DD" = "yyyy", "M/D/YY" = "mdyy"),
+                                 selected = "yyyy", inline = TRUE),
+                    checkboxInput("proc_run_stuff", "Append Stuff+ predictions", value = TRUE),
+                    actionButton("proc_run", "Process Data", class = "btn-primary",
+                                 style = "margin-top: 10px;")
+                ),
+                br(),
+                div(class = "upload-box",
+                    h4("Columns to Remove", style = "color: #006F71; margin-top: 0;"),
+                    div(style = "margin-bottom: 8px;",
+                        actionButton("proc_cols_all",  "Select All",     class = "btn-secondary",
+                                     style = "width:auto; padding:4px 10px; font-size:12px; margin-right:4px;"),
+                        actionButton("proc_cols_none", "Clear",          class = "btn-secondary",
+                                     style = "width:auto; padding:4px 10px; font-size:12px; margin-right:4px;"),
+                        actionButton("proc_cols_spin", "Spin-Axis Only", class = "btn-secondary",
+                                     style = "width:auto; padding:4px 10px; font-size:12px;")
+                    ),
+                    div(style = "max-height: 220px; overflow-y: auto; font-size: 0.85em;",
+                        checkboxGroupInput("proc_drop_cols", NULL,
+                                           choices = columns_to_remove,
+                                           selected = columns_to_remove)
+                    )
+                ),
+                hr(),
+                uiOutput("proc_download_ui")
+            )
+          ),
+          column(
+            8,
+            div(class = "main-panel",
+                h3("Processed Data", style = "color: #006F71; margin-top: 0;"),
+                uiOutput("proc_status"),
+                verbatimTextOutput("proc_summary"),
+                br(),
+                h4("Preview (first 15 rows)", style = "color: #006F71;"),
+                div(style = "overflow-x: auto;",
+                    tableOutput("proc_preview")
+                )
+            )
+          )
+        )
     )
   )
 )
@@ -6883,6 +6947,128 @@ server <- function(input, output, session) {
     },
     contentType = "application/zip"
   )
+
+  # ===================== DATA PROCESSING TAB =====================
+  proc_result <- reactiveVal(NULL)
+
+  # Column-selection helper buttons
+  observeEvent(input$proc_cols_all, {
+    updateCheckboxGroupInput(session, "proc_drop_cols", selected = columns_to_remove)
+  })
+  observeEvent(input$proc_cols_none, {
+    updateCheckboxGroupInput(session, "proc_drop_cols", selected = character(0))
+  })
+  observeEvent(input$proc_cols_spin, {
+    spin_cols <- columns_to_remove[grepl("SpinAxis3d", columns_to_remove)]
+    updateCheckboxGroupInput(session, "proc_drop_cols", selected = spin_cols)
+  })
+
+  # Run the pipeline
+  observeEvent(input$proc_run, {
+    if (is.null(input$proc_file)) {
+      showNotification("Please choose a CSV or Parquet file first.", type = "warning", duration = 5)
+      return(NULL)
+    }
+    json_path <- if (!is.null(input$proc_json)) input$proc_json$datapath else NULL
+
+    withProgress(message = "Processing data...", value = 0, {
+      result <- tryCatch({
+        incProgress(0.2, detail = "Reading and cleaning")
+        df <- process_uploaded_trackman(
+          filepath      = input$proc_file$datapath,
+          filename      = input$proc_file$name,
+          json_path     = json_path,
+          drop_columns  = input$proc_drop_cols %||% character(0),
+          date_format   = input$proc_date_format,
+          run_stuffplus = isTRUE(input$proc_run_stuff)
+        )
+        incProgress(0.7, detail = "Finalizing")
+        df
+      }, error = function(e) {
+        showNotification(paste("Processing error:", e$message), type = "error", duration = 10)
+        NULL
+      })
+      proc_result(result)
+    })
+
+    if (!is.null(proc_result())) {
+      showNotification(
+        paste0("Processed ", format(nrow(proc_result()), big.mark = ","),
+               " rows x ", ncol(proc_result()), " columns."),
+        type = "message", duration = 4
+      )
+    }
+  })
+
+  output$proc_status <- renderUI({
+    if (is.null(proc_result())) {
+      div(style = "color:#888; font-style:italic;",
+          "Upload a raw TrackMan file and click Process Data to begin.")
+    } else {
+      div(style = "color:#006F71; font-weight:bold;", "Processing complete.")
+    }
+  })
+
+  output$proc_summary <- renderPrint({
+    df <- proc_result()
+    if (is.null(df)) return(invisible(NULL))
+    has_stuff <- "stuff_plus" %in% names(df)
+    has_bat   <- "BatSpeed_Sensor" %in% names(df)
+    cat("Rows:        ", format(nrow(df), big.mark = ","), "\n", sep = "")
+    cat("Columns:     ", ncol(df), "\n", sep = "")
+    cat("Stuff+ added:", if (has_stuff) " yes" else " no", "\n", sep = "")
+    if (has_stuff) {
+      sp <- suppressWarnings(round(mean(df$stuff_plus, na.rm = TRUE), 1))
+      cat("Mean Stuff+: ", sp, "\n", sep = "")
+    }
+    if (has_bat) {
+      matched <- sum(!is.na(df$BatSpeed_Sensor))
+      cat("Bat-tracking matched:", matched, "\n", sep = " ")
+    }
+  })
+
+  output$proc_preview <- renderTable({
+    df <- proc_result()
+    if (is.null(df)) return(NULL)
+    pref <- c("Date", "Pitcher", "Batter", "TaggedPitchType", "PitchCall",
+              "PlayResult", "RelSpeed", "SpinRate", "stuff_plus", "woba")
+    cols <- intersect(pref, names(df))
+    if (length(cols) == 0) cols <- names(df)[seq_len(min(10, ncol(df)))]
+    head(df[, cols, drop = FALSE], 15)
+  }, striped = TRUE, hover = TRUE, bordered = TRUE, spacing = "xs", digits = 2, na = "")
+
+  output$proc_download_ui <- renderUI({
+    if (is.null(proc_result())) return(NULL)
+    tagList(
+      downloadButton("proc_download_csv", "Download Processed CSV", class = "btn-primary"),
+      br(), br(),
+      downloadButton("proc_download_parquet", "Download Processed Parquet", class = "btn-secondary")
+    )
+  })
+
+  output$proc_download_csv <- downloadHandler(
+    filename = function() {
+      base <- if (!is.null(input$proc_file)) tools::file_path_sans_ext(input$proc_file$name) else "trackman"
+      paste0(base, "_processed.csv")
+    },
+    content = function(file) {
+      df <- proc_result(); req(df)
+      write.csv(df, file, row.names = FALSE, na = "")
+    }
+  )
+
+  output$proc_download_parquet <- downloadHandler(
+    filename = function() {
+      base <- if (!is.null(input$proc_file)) tools::file_path_sans_ext(input$proc_file$name) else "trackman"
+      paste0(base, "_processed.parquet")
+    },
+    content = function(file) {
+      df <- proc_result(); req(df)
+      arrow::write_parquet(df, file)
+    }
+  )
+  # =================== END DATA PROCESSING TAB ===================
+
 }
 
 shinyApp(ui = ui, server = server)