Browse Source

Délacement du bloc filteredData() avant son utilisation

master
Maxime Wack 7 years ago
parent
commit
bfc122390a
1 changed files with 25 additions and 20 deletions
  1. +25
    -20
      app.R

+ 25
- 20
app.R View File

@@ -91,26 +91,6 @@ server <- function(input, output, session)
communes[lats >= latrng[1] & lats <= latrng[2] & lngs >= lngrng[1] & lngs <= lngrng[2],]$Codepos
})

# Filter GHM
filteredData <- reactive({
if (input$choice_ghm %>% is.null)
{
GHM %>%
filter(Sexe %in% input$check_sexe,
Age <= input$slider_age[2] & Age >= input$slider_age[1],
date_entree <= input$slider_date[2] & date_sortie >= input$slider_date[1],
CP %in% in_bounds())
} else
{
GHM %>%
filter(Sexe %in% input$check_sexe,
Age <= input$slider_age[2] & Age >= input$slider_age[1],
GHM %in% input$choice_ghm,
date_entree <= input$slider_date[2] & date_sortie >= input$slider_date[1],
CP %in% in_bounds())
}
})

# GHM
data_ghm <- reactive({
req(input$slider_age, input$check_sexe, input$slider_date, in_bounds())
@@ -199,6 +179,31 @@ server <- function(input, output, session)
theme(axis.title = element_blank(),
legend.position = "none")
})

# filtered GHM
filteredData <- reactive({
req(input$check_sexe, input$slider_age, input$slider_date, in_bounds())

if(input$choice_ghm %>% is.null)
{
GHM %>%
filter(Sexe %in% input$check_sexe,
Age <= input$slider_age[2] & Age >= input$slider_age[1],
date_entree <= input$slider_date[2] & date_sortie >= input$slider_date[1],
Codepos %in% in_bounds()) %>%
count(Codepos)
} else
{
GHM %>%
filter(Sexe %in% input$check_sexe,
Age <= input$slider_age[2] & Age >= input$slider_age[1],
GHM %in% input$choice_ghm,
date_entree <= input$slider_date[2] & date_sortie >= input$slider_date[1],
Codepos %in% in_bounds()) %>%
count(Codepos)
}
})

# Map

# observe({


Loading…
Cancel
Save