Skip to content

Commit

Permalink
quick fix #58 #59
Browse files Browse the repository at this point in the history
  • Loading branch information
zross committed Jul 16, 2021
1 parent cf79bc8 commit 4b12b4d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
1 change: 0 additions & 1 deletion R/mod_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ dataServer <- function(id, state) {
)



tbl <- DT::datatable(
data = table_data,
class = "display nowrap",
Expand Down
10 changes: 8 additions & 2 deletions R/mod_side_geography.R
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sidebarGeoUI <- function(id) {
ns("sel_maa"),
"Managed access area",
choices = fma_init_geo_selections$maa$choices,
selected = fma_init_geo_selections$maa$selected,
selected = NULL,
multiple = TRUE,
selectize = TRUE
),
Expand Down Expand Up @@ -176,13 +176,19 @@ sidebarGeoServer <- function(id, state) {
if (!setequal(input$sel_maa, state$maa$selected)) {
state$maa$selected <- input$sel_maa
}
state$data_filtered <- state$data_full %>%
data_filtered <- state$data_full %>%
dplyr::filter(
country %in% input$sel_country,
subnational %in% input$sel_subnational,
local %in% input$sel_local,
maa %in% input$sel_maa
)


state$data_filtered <- data_filtered
state$data_summary_filtered <- data_filtered %>%
create_data_summary()

},
ignoreInit = TRUE
)
Expand Down
5 changes: 4 additions & 1 deletion R/mod_side_performance_indicators.R
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ sidebarIndicatorServer <- function(id, state) {

# ---- Data tab
if (current_tab %in% c("1. Assess data", "2. Visualize data", "3. Visualize data")) {

ui[["date_slider"]] <- div(
class = "date_slider pi_widget",
sliderInput(ns("date_range"),
Expand All @@ -80,7 +81,8 @@ sidebarIndicatorServer <- function(id, state) {
timeFormat = "%F"
)
)
}
}




Expand Down Expand Up @@ -145,6 +147,7 @@ sidebarIndicatorServer <- function(id, state) {

state$data_filtered <- data_filtered


state$data_summary_filtered <- data_filtered %>%
create_data_summary()

Expand Down

0 comments on commit 4b12b4d

Please sign in to comment.