diff --git a/dashboard.Rmd b/dashboard.Rmd index 5fa7e89..29b55cf 100644 --- a/dashboard.Rmd +++ b/dashboard.Rmd @@ -243,7 +243,7 @@ observeEvent(input$selectStorm, { ```{r} output$normalized_storms_table <- renderDT({ datatable( - latest_normalized_losses, + latest_normalized_losses %>% select(-hurdatId), rownames = F, colnames = c("Storm", "Year", "MMH24", "MMP24"), selection = "single", @@ -366,8 +366,7 @@ Col {data-width=500} fluidRow( column(6, HTML(' -
Katrina recorded 1,392 fatalities
-

Surge: 387

+ ') ), column(6, @@ -591,12 +590,32 @@ Sandbox {data-navmenu="Compute"} Data {data-navmenu="Compute"} === -Top 50 Storms +All Storms Table === ```{r} #DT with storm, hurdatid, base damage, mmh, mmp, maybe multipliers?, sparkline? +output$normalized_storms_full_table <- renderDT({ + datatable( + latest_normalized_losses, + rownames = F, + colnames = c("HURDAT Code", "Storm", "Year", "MMH24", "MMP24"), + selection = "none", + options = list( + pageLength = 20, + order = list(0, 'asc'), + #searching = F, + #paging = F, + #info = F, + #lengthChange = F, + server = T + ) + ) %>% + formatCurrency(c("mmh", "mmp"), "$", digits = 0) +}) + +DTOutput("normalized_storms_full_table") ``` diff --git a/queries.R b/queries.R index 1ce96f4..3b03bc1 100644 --- a/queries.R +++ b/queries.R @@ -113,11 +113,12 @@ get_latest_aggregate_losses <- function() { .groups = "drop" ) %>% filter(!is.na(mmh) & !is.na(mmp)) %>% + left_join(hurdat.hurdat_storms, by = c("storm_basin", "storm_year", "storm_name")) %>% + mutate( + hurdatId = paste0(storm_basin, storm_number, storm_year) + ) %>% select( - storm_name, - storm_year, - mmh, - mmp + hurdatId, storm_name, storm_year, mmh, mmp ) result <- query %>% collect()