changing summer semester setup

DataINCITE · Jun 8, 2021 · 282864ce53e6fd4c221f0e3fd631604af419daa2 · 282864c
1 parent 40dbec2
commit 282864ce53e6fd4c221f0e3fd631604af419daa2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/app.R b/app.R
@@ -344,7 +344,7 @@ server <- function(input, output, session) {
       #are we going forwards in time?
       else if (semester_val > date_val){
         if(input$semester == "s21"){
-          updateDateInput(session, "day", max = max(rpi_wap_raw$Date), value = max(rpi_wap_raw$Date),)
+          updateDateInput(session, "day", max = max(spring_dates), value = max(spring_dates),)
           updateDateInput(session, "day", min = min(spring_dates))
         }
         else if(input$semester == "su21"){
@@ -397,7 +397,7 @@ server <- function(input, output, session) {
         }
         else{
           db <- dbConnect(MySQL(), dbname = "safecampus", user = "dataincite", password = "P4Z2w@d!", host = "sequel.idea.rpi.edu")
-          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_s21 WHERE Date='", as.Date(input$day),"'", " AND ", "time BETWEEN '", start_time, "'", " AND '", end_time, "'"))
+          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_su21 WHERE Date='", as.Date(input$day),"'", " AND ", "time BETWEEN '", start_time, "'", " AND '", end_time, "'"))
           dbDisconnect(db)
           combined_wap_data_final <- query_data %>% 
             filter(buildingType %in% input$buildingtype) %>%
@@ -502,7 +502,7 @@ server <- function(input, output, session) {
         }
         else{
           db <- dbConnect(MySQL(), dbname = "safecampus", user = "dataincite", password = "P4Z2w@d!", host = "sequel.idea.rpi.edu")
-          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_s21 WHERE Date= '", input$day, "'"))
+          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_su21 WHERE Date= '", input$day, "'"))
           dbDisconnect(db)
           daily_data <-query_data %>% filter(abbrev == abbreviation)
         }
@@ -548,7 +548,7 @@ server <- function(input, output, session) {
             dplyr::summarize(day_sum = sum(usercount))
         }
         else{
-          week_data <- rpi_wap_raw %>% filter(abbrev == abbreviation) %>% 
+          week_data <- query_data %>% filter(abbrev == abbreviation) %>% 
             dplyr::group_by(Date)%>%
             dplyr::summarize(day_sum = sum(maccount))
         }
@@ -565,7 +565,7 @@ server <- function(input, output, session) {
               dplyr::summarize(day_sum = sum(usercount))
           }
           else{
-            week_data <- rpi_wap_raw %>% filter(abbrev == abbreviation) %>% 
+            week_data <- query_data %>% filter(abbrev == abbreviation) %>% 
               dplyr::group_by(Date)%>%
               dplyr::summarize(day_sum = sum(maccount))
           }
@@ -587,15 +587,15 @@ server <- function(input, output, session) {
           start_date <- as.Date(input$day)
           end_date <- start_date+days(7)
           db <- dbConnect(MySQL(), dbname = "safecampus", user = "dataincite", password = "P4Z2w@d!", host = "sequel.idea.rpi.edu")
-          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_s21 WHERE Date BETWEEN '", start_date, "'", " AND '", end_date, "'"))
+          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_su21 WHERE Date BETWEEN '", start_date, "'", " AND '", end_date, "'"))
           dbDisconnect(db)
           if(input$datatype == "user"){
             week_data <- query_data %>% filter(abbrev == abbreviation) %>% 
               dplyr::group_by(Date)%>%
               dplyr::summarize(day_sum = sum(usercount))
           }
           else{
-            week_data <- rpi_wap_raw %>% filter(abbrev == abbreviation) %>% 
+            week_data <- query_data %>% filter(abbrev == abbreviation) %>% 
               dplyr::group_by(Date)%>%
               dplyr::summarize(day_sum = sum(maccount))
           }
@@ -605,7 +605,6 @@ server <- function(input, output, session) {
 
     #function to print day plot
     print_day_plot <- function(){
-      print(day_dat())
       max_y <- max(day_dat()$total)
       marker_info <- input$bubblemap_marker_click
       abbreviation <- buildinginfo$abbrev[buildinginfo$latitude == marker_info$lat & buildinginfo$longitude == marker_info$lng]
@@ -717,8 +716,8 @@ server <- function(input, output, session) {
       #are we going forwards in time?
       else if (semester_val > date_val){
         if(input$semester_discrete == "s21"){
-          updateDateInput(session, "date_discrete", max = max(rpi_wap_raw$Date), value = max(rpi_wap_raw$Date),)
-          updateDateInput(session, "date_discrete", min = min(spring_dates))
+          updateDateInput(session, "day", max = max(spring_dates), value = max(spring_dates),)
+          updateDateInput(session, "day", min = min(spring_dates))
         }
         else if(input$semester_discrete == "su21"){
           updateDateInput(session, "date_discrete", max = max(rpi_wap_raw$Date), value = max(rpi_wap_raw$Date),)
@@ -746,7 +745,7 @@ server <- function(input, output, session) {
         }
         else{
           db <- dbConnect(MySQL(), dbname = "safecampus", user = "dataincite", password = "P4Z2w@d!", host = "sequel.idea.rpi.edu")
-          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_s21 WHERE Date= '", input$date_discrete, "'"))
+          query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_su21 WHERE Date= '", input$date_discrete, "'"))
           dbDisconnect(db)
         }
       }
@@ -1207,8 +1206,8 @@ server <- function(input, output, session) {
     #are we going forwards in time?
     else if (semester_val > date_val){
       if(input$semester_continuous == "s21"){
-        updateDateInput(session, "date", max = max(rpi_wap_raw$Date), value = max(rpi_wap_raw$Date),)
-        updateDateInput(session, "date", min = min(spring_dates))
+        updateDateInput(session, "day", max = max(spring_dates), value = max(spring_dates),)
+        updateDateInput(session, "day", min = min(spring_dates))
       }
       else if(input$semester_continuous == "su21"){
         updateDateInput(session, "date", max = max(rpi_wap_raw$Date), value = max(rpi_wap_raw$Date),)
@@ -1254,7 +1253,7 @@ server <- function(input, output, session) {
       }
       else{
         db <- dbConnect(MySQL(), dbname = "safecampus", user = "dataincite", password = "P4Z2w@d!", host = "sequel.idea.rpi.edu")
-        query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_s21 WHERE Date= '", input$date, "'"))
+        query_data <- dbGetQuery(db, paste0("SELECT * FROM rpi_wap_su21 WHERE Date= '", input$date, "'"))
         dbDisconnect(db)
       }
     }
@@ -1437,7 +1436,6 @@ server <- function(input, output, session) {
       rownames(cont_table) <- NULL
       colnames(cont_table) <- c("WAP Name", "Maximum Number of Users", "Peak Time")
       cont_table
-      print(cont_table)
     }
     else if(input$buildingStr!="all"&input$data_type_continous=="macs"){
       building_macs<-paste("Total Number of Devicess in", fullname)

diff --git a/building_info.R b/building_info.R
@@ -202,8 +202,8 @@ now_time <- as_datetime(hms::parse_hm(toString(now_data$time[nrow(now_data)])))
 
 #semester dates
 fall_dates <- seq(as.Date('2020-08-31'), as.Date('2020-11-20'), by = 'days')
-spring_dates <- seq(as.Date('2021-01-25'), as.Date('2021-05-12'), by = 'days')
-summer_dates <- seq(as.Date('2021-05-13'), as.Date('2021-08-20'), by = 'days')
+spring_dates <- seq(as.Date('2021-01-25'), as.Date('2021-05-23'), by = 'days')
+summer_dates <- seq(as.Date('2021-05-24'), as.Date('2021-08-20'), by = 'days')
 
 #functions to help determine if we are going backwards or forwards in time for switching semesters
 semester_val <- function(semester){