Update data input selection in regional composition plot

WorldFishCenter · Oct 18, 2023 · 8937af2 · 8937af2
1 parent 6906753
commit 8937af2
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 5 deletions.
diff --git a/R/mod_region_composition.R b/R/mod_region_composition.R
@@ -10,13 +10,11 @@
 mod_region_composition_ui <- function(id, heading = NULL, apex_height = "20rem", ...) {
   ns <- NS(id)
 
-  # if (is.null(years)) {
-  years <- seq(as.numeric(format(Sys.Date(), "%Y")), "2018")
-  # }
+  years <- list("Year" = seq(as.numeric(format(Sys.Date(), "%Y")), "2018"))
 
   s <- selectInput(ns("y"),
     label = "",
-    choices = years,
+    choices = c("All data", years),
     selectize = FALSE,
     width = "auto"
   )
@@ -60,11 +58,18 @@ mod_region_composition_server <- function(id,
     ns <- session$ns
 
     plot_data <- reactive({
+
+      if (input$y == "All data") {
+        year_selected <- c(2018:data.table::year(Sys.Date()))
+      } else {
+        year_selected <- input$y
+      }
+
       region_composition <-
         peskas.timor.portal::municipal_taxa %>%
         dplyr::select(region, date_bin_start, catch, grouped_taxa) %>%
         dplyr::mutate(year = data.table::year(date_bin_start)) %>%
-        dplyr::filter(year %in% input$y) %>%
+        dplyr::filter(year %in% year_selected) %>%
         dplyr::group_by(region, grouped_taxa) %>%
         dplyr::summarise(catch = sum(catch)) %>%
         dplyr::mutate(

diff --git a/data/aggregated.rda b/data/aggregated.rda
diff --git a/data/data_last_updated.rda b/data/data_last_updated.rda
diff --git a/data/indicators_grid.rda b/data/indicators_grid.rda
diff --git a/data/label_groups_list.rda b/data/label_groups_list.rda
diff --git a/data/municipal_aggregated.rda b/data/municipal_aggregated.rda
diff --git a/data/municipal_taxa.rda b/data/municipal_taxa.rda
diff --git a/data/nutrients_aggregated.rda b/data/nutrients_aggregated.rda
diff --git a/data/pars.rda b/data/pars.rda
diff --git a/data/summary_data.rda b/data/summary_data.rda
diff --git a/data/taxa_aggregated.rda b/data/taxa_aggregated.rda
diff --git a/data/taxa_names.rda b/data/taxa_names.rda