Update app.R

app.R

@@ -3,10 +3,9 @@ library(gt)
 library(dplyr)
 library(shinyjs)
 library(shinyauthr)
-#library(gtExtras)
+library(gtExtras)
 library(bslib)
-library(httr)
-#library(baseballr)
+library(baseballr)
 
 download_private_csv <- function(repo_id, filename) {
   url <- paste0("https://huggingface.co/datasets/", repo_id, "/resolve/main/", filename)
@@ -30,8 +29,8 @@ download_private_csv <- function(repo_id, filename) {
 }
 
 Beam <- download_private_csv("TimStats/CollegePriv", "Beam.csv")
-TMP <- download_private_csv("TimStats/CollegePriv", "TMP.csv")
-TMB <- download_private_csv("TimStats/CollegePriv", "TMB.csv")
+Beam <- download_private_csv("TimStats/TMP", "Beam.csv")
+Beam <- download_private_csv("TimStats/RMB", "Beam.csv")
 
 test <- Beam %>%
   select(Date,PitchofPA,Pitcher,PitcherId,PitcherThrows,PitcherTeam,Batter,BatterId,
@@ -69,6 +68,12 @@ test <- test %>%
          "Out" = case_when(PlayResult %in% c ("Out") ~ TRUE, TRUE ~ FALSE),
          "BIP" = Single + Double + Triple + HR + Sac + Error + Out + FC,
          "Count" = paste0(Balls,"-",Strikes),
+         "BSituation" = ifelse(Balls > Strikes,"Ahead",NA),
+         "BSituation" = ifelse(Balls < Strikes,"Behind",BSituation),
+         "BSituation" = ifelse(Balls == Strikes,"Even",BSituation),
+         "PSituation" = ifelse(Balls < Strikes,"Ahead",NA),
+         "PSituation" = ifelse(Balls > Strikes,"Behind",PSituation),
+         "PSituation" = ifelse(Balls == Strikes,"Even",PSituation),
          "Strikeout" = ifelse(KorBB == "Strikeout",TRUE,FALSE),
          "Walk" = ifelse(KorBB == "Walk",TRUE,FALSE),
          "Zone" = case_when(between(PlateLocSide,-.825,.825) & between(PlateLocHeight,1.45,3.45) ~ TRUE, TRUE ~ FALSE),
@@ -76,8 +81,8 @@ test <- test %>%
          "PA" = Strikeout + BIP + Walk + HBP
   )
 test <- test %>%
-  left_join(TMB, by = c(BatterTeam = "team_abbr")) %>%
-  left_join(TMP, by = c(PitcherTeam = "team_abbr")) %>%
+  left_join(TMSchoolsB, by = c(BatterTeam = "team_abbr")) %>%
+  left_join(TMSchoolsP, by = c(PitcherTeam = "team_abbr")) %>%
   mutate(PitcherAndTeam = paste0(Pitcher," - ",PTeamName)) %>%
   mutate(BatterAndTeam = paste0(Batter," - ",BTeamName))
 
@@ -165,8 +170,8 @@ gt_theme_tim <- function(gt_object,...) {
 }
 
 user_base <- tibble::tibble(
-  user = c(Sys.getenv(Username)),
-  password = (c(Sys.getenv(Password))),
+  user = c(Sys.getenv("Username")),
+  password = (c(Sys.getenv("Password"))),
   permissions = c("admin"),
   name = c("User One")
 )
@@ -183,11 +188,10 @@ ui <- fluidPage(
     )
   ),
   
-  # Rest of your existing UI code stays exactly the same
   div(class = "pull-right", shinyauthr::logoutUI(id = "logout")),
-  
+
   shinyauthr::loginUI(id = "login"),
-  
+
   div(
     id = "bar",
     titlePanel("TimMedia"),
@@ -299,12 +303,8 @@ server <- function(input, output, session) {
       shinyjs::hide(id = "bar")
     }
   })
-  # observeEvent(input$date,{
-  #   test <- test %>% filter(between(as.Date(Date),input$date[1],input$date[2]))
-  # })
-
   output$CountFilterP <- render_gt({
-    test <- test %>% filter(PitcherAndTeam == input$player) %>% group_by(Count) %>% 
+    t <- test %>% filter(PitcherAndTeam == input$player) %>% group_by(Count) %>% 
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
@@ -329,7 +329,37 @@ server <- function(input, output, session) {
                         sum(PA,na.rm = TRUE),digits = 3),
         "SLG" = (round(sum(Single,na.rm = TRUE) + sum(Double,na.rm = TRUE) * 2 + 
                          sum(Triple,na.rm = TRUE) * 3 + sum(HR,na.rm = TRUE)))/sum(AB,na.rm = TRUE))%>%
-      ungroup()%>% 
+      ungroup() 
+      
+      tt <- test %>% mutate(Count = PSituation) %>% filter(PitcherAndTeam == input$player) %>% group_by(Count) %>% 
+        filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
+        summarise(
+          Pitches = n(),
+          #BBE = sum(BBE,na.rm = TRUE),
+          "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
+          "SwStr%" = mean(Whiff,na.rm = TRUE),
+          "CSW%" = mean(CSW,na.rm = TRUE),
+          "Zone%" = mean(Zone,na.rm = TRUE),
+          "ZCon%" = mean(Contact[Zone == TRUE & Swing == TRUE],na.rm = TRUE),
+          "ZSwing%" = mean(Swing[Zone == TRUE],na.rm = TRUE),
+          "OCon%" = mean(Contact[Zone == FALSE & Swing == TRUE],na.rm = TRUE),
+          "OSwing%" = mean(Swing[Zone == FALSE],na.rm = TRUE),
+          "Avg EV" = mean(ExitSpeed[BBE == TRUE],na.rm = TRUE),
+          "EV90" = quantile(ExitSpeed[BBE == TRUE],.9,na.rm = TRUE),
+          "Max EV" = max(ExitSpeed[BBE == TRUE],na.rm = TRUE),
+          "Max EV" = ifelse(is.infinite(`Max EV`),NA,`Max EV`),
+          "GB%" = mean(GB[BBE == TRUE],na.rm = TRUE),
+          "LD%" = mean(LD[BBE == TRUE],na.rm = TRUE),
+          "FB%" = mean(FB[BBE == TRUE],na.rm = TRUE),
+          "AVG" = round(sum(Hit,na.rm = TRUE) / sum(AB,na.rm = TRUE),digits = 3),
+          "OBP" = round((sum(Hit,na.rm = TRUE) + sum(Walk,na.rm = TRUE) + sum(HBP,na.rm = TRUE))/ 
+                          sum(PA,na.rm = TRUE),digits = 3),
+          "SLG" = (round(sum(Single,na.rm = TRUE) + sum(Double,na.rm = TRUE) * 2 + 
+                           sum(Triple,na.rm = TRUE) * 3 + sum(HR,na.rm = TRUE)))/sum(AB,na.rm = TRUE)) %>%
+        ungroup()
+      
+      test <- rbind(tt,t)
+      test %>%
       gt() %>% 
       gt_theme_tim() %>%
       fmt_number(columns = `Avg EV`:`Max EV`,decimals = 1) %>%
@@ -346,7 +376,7 @@ server <- function(input, output, session) {
       )
   })
   output$PitchFilterP <- render_gt({
-    tes <- test %>% 
+    test %>% 
       filter(PitcherAndTeam == input$player) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       group_by(AutoPitchType) %>%
@@ -354,6 +384,7 @@ server <- function(input, output, session) {
         Pitches = n(),
         # BBE = sum(BBE,na.rm = TRUE),
         "Usage%" = n() / nrow(.),  # Added Usage% calculation
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW, na.rm = TRUE),
@@ -396,7 +427,7 @@ server <- function(input, output, session) {
       )
   })
   output$PitchSideFilterP <- render_gt({
-    test <- test %>% 
+    test %>% 
       filter(PitcherAndTeam == input$player) %>% 
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       group_by(BatterSide) %>%
@@ -407,6 +438,7 @@ server <- function(input, output, session) {
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
         "Usage%" = (n() / first(total_side)),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW, na.rm = TRUE),
@@ -450,11 +482,12 @@ server <- function(input, output, session) {
       )
   })
   output$InningFilterP <- render_gt({
-    test <- test %>% filter(PitcherAndTeam == input$player) %>% group_by(Inning) %>%
+    test %>% filter(PitcherAndTeam == input$player) %>% group_by(Inning) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -497,6 +530,7 @@ server <- function(input, output, session) {
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -523,6 +557,7 @@ server <- function(input, output, session) {
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -564,7 +599,7 @@ server <- function(input, output, session) {
     
   })
   output$slashlineP <- render_gt({
-    test <- test %>%  filter(PitcherAndTeam == input$player) %>%
+    test %>%  filter(PitcherAndTeam == input$player) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
@@ -589,11 +624,12 @@ server <- function(input, output, session) {
   })
   
   output$CountFilterB <- render_gt({
-    test <- test %>% filter(BatterAndTeam == input$player) %>% group_by(Count) %>% 
+    t <- test %>% filter(BatterAndTeam == input$player) %>% group_by(Count) %>% 
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -614,7 +650,37 @@ server <- function(input, output, session) {
                         sum(PA,na.rm = TRUE),digits = 3),
         "SLG" = (round(sum(Single,na.rm = TRUE) + sum(Double,na.rm = TRUE) * 2 + 
                          sum(Triple,na.rm = TRUE) * 3 + sum(HR,na.rm = TRUE)))/sum(AB,na.rm = TRUE))%>%
-      ungroup()%>% 
+      ungroup()
+    tt <- test %>% mutate(Count = BSituation) %>% filter(BatterAndTeam == input$player) %>% group_by(Count) %>% 
+      filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
+      summarise(
+        Pitches = n(),
+        #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
+        "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
+        "SwStr%" = mean(Whiff,na.rm = TRUE),
+        "CSW%" = mean(CSW,na.rm = TRUE),
+        "Zone%" = mean(Zone,na.rm = TRUE),
+        "ZCon%" = mean(Contact[Zone == TRUE & Swing == TRUE],na.rm = TRUE),
+        "ZSwing%" = mean(Swing[Zone == TRUE],na.rm = TRUE),
+        "OCon%" = mean(Contact[Zone == FALSE & Swing == TRUE],na.rm = TRUE),
+        "OSwing%" = mean(Swing[Zone == FALSE],na.rm = TRUE),
+        "Avg EV" = mean(ExitSpeed[BBE == TRUE],na.rm = TRUE),
+        "EV90" = quantile(ExitSpeed[BBE == TRUE],.9,na.rm = TRUE),
+        "Max EV" = max(ExitSpeed[BBE == TRUE],na.rm = TRUE),
+        "Max EV" = ifelse(is.infinite(`Max EV`),NA,`Max EV`),
+        "GB%" = mean(GB[BBE == TRUE],na.rm = TRUE),
+        "LD%" = mean(LD[BBE == TRUE],na.rm = TRUE),
+        "FB%" = mean(FB[BBE == TRUE],na.rm = TRUE),
+        "AVG" = round(sum(Hit,na.rm = TRUE) / sum(AB,na.rm = TRUE),digits = 3),
+        "OBP" = round((sum(Hit,na.rm = TRUE) + sum(Walk,na.rm = TRUE) + sum(HBP,na.rm = TRUE))/ 
+                        sum(PA,na.rm = TRUE),digits = 3),
+        "SLG" = (round(sum(Single,na.rm = TRUE) + sum(Double,na.rm = TRUE) * 2 + 
+                         sum(Triple,na.rm = TRUE) * 3 + sum(HR,na.rm = TRUE)))/sum(AB,na.rm = TRUE))%>%
+      ungroup()
+    
+    test <- rbind(tt,t)
+    test %>%
       gt() %>% 
       gt_theme_tim() %>%
       fmt_number(columns = `Avg EV`:`Max EV`,decimals = 1) %>%
@@ -631,7 +697,7 @@ server <- function(input, output, session) {
       )
   })
   output$PitchFilterB <- render_gt({
-    tes <- test %>% 
+    test %>% 
       filter(BatterAndTeam == input$player) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       group_by(AutoPitchType) %>%
@@ -639,6 +705,7 @@ server <- function(input, output, session) {
         Pitches = n(),
         # BBE = sum(BBE,na.rm = TRUE),
         "Pitch%" = n() / nrow(.),  # Added Pitch% calculation
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW, na.rm = TRUE),
@@ -681,7 +748,7 @@ server <- function(input, output, session) {
       )
   })
   output$PitchSideFilterB <- render_gt({
-    test <- test %>% 
+    test %>% 
       filter(BatterAndTeam == input$player) %>% 
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       group_by(PitcherThrows) %>%
@@ -692,6 +759,7 @@ server <- function(input, output, session) {
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
         "Pitch%" = (n() / first(total_side)),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW, na.rm = TRUE),
@@ -735,11 +803,12 @@ server <- function(input, output, session) {
       )
   })
   output$InningFilterB <- render_gt({
-    test <- test %>% filter(BatterAndTeam == input$player) %>% group_by(Inning) %>%
+    test %>% filter(BatterAndTeam == input$player) %>% group_by(Inning) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -782,6 +851,7 @@ server <- function(input, output, session) {
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -808,6 +878,7 @@ server <- function(input, output, session) {
       summarise(
         Pitches = n(),
         #BBE = sum(BBE,na.rm = TRUE),
+        "Swings" = sum(Swing,na.rm = TRUE),
         "Whiff%" = mean(Whiff[Swing == TRUE],na.rm = TRUE),
         "SwStr%" = mean(Whiff,na.rm = TRUE),
         "CSW%" = mean(CSW,na.rm = TRUE),
@@ -849,7 +920,7 @@ server <- function(input, output, session) {
     
   })
   output$slashlineB <- render_gt({
-    test <- test %>%  filter(BatterAndTeam == input$player) %>%
+    test %>%  filter(BatterAndTeam == input$player) %>%
       filter(between(as.Date(Date),input$date[1],input$date[2])) %>%
       summarise(
         Pitches = n(),
@@ -873,6 +944,8 @@ server <- function(input, output, session) {
       )
   })
   
+  
+  
 }
 
 # Run the application