Skip to content
Snippets Groups Projects
Commit 75333c61 authored by Franck.Gaspard's avatar Franck.Gaspard
Browse files

modification du module de visualisation de l'exploration des mesures : çà a...

modification du module de visualisation de l'exploration des mesures : çà a l'air de fonctionner correctement
parent 674edeaf
Branches
No related tags found
No related merge requests found
...@@ -136,31 +136,44 @@ mod_visualisation_explorer_mesures_server <- function(id, global){ ...@@ -136,31 +136,44 @@ mod_visualisation_explorer_mesures_server <- function(id, global){
} }
else{ else{
if(explorer_SelectStation == "Toutes"){ # J'EN SUIS LA ------------ if(explorer_SelectStation == "Toutes"){ # J'EN SUIS LA ------------
if(explorer_SelectSage == "Tous"){ if(length(explorer_SelectSage) > 1){
matrice %>%
dplyr::filter(
# nom_sage %in% explorer_SelectSage,
dplyr::between(as.numeric(as.character(annee_prelevement)), explorer_SelectAnnee[1], explorer_SelectAnnee[2]),
resultat_analyse >= explorer_SelectConcentrationmin
) %>%
dplyr::select(
annee_prelevement, date_prelevement, code_station,libelle_station,insee_dep,
nom_parametre, code_remarque, resultat_analyse, Exigenceeaudistribuee
)
}
else{
matrice %>% matrice %>%
dplyr::filter( dplyr::filter(
nom_sage %in% explorer_SelectSage, nom_sage %in% explorer_SelectSage,
dplyr::between(as.numeric(as.character(annee_prelevement)), explorer_SelectAnnee[1], explorer_SelectAnnee[2]), dplyr::between(as.numeric(as.character(annee_prelevement)), explorer_SelectAnnee[1], explorer_SelectAnnee[2]),
resultat_analyse >= explorer_SelectConcentrationmin resultat_analyse >= explorer_SelectConcentrationmin
) %>% ) %>%
dplyr::select( dplyr::select(
annee_prelevement, date_prelevement, code_station,libelle_station,insee_dep, annee_prelevement, date_prelevement, code_station,libelle_station,insee_dep,
nom_parametre, code_remarque, resultat_analyse, Exigenceeaudistribuee nom_parametre, code_remarque, resultat_analyse, Exigenceeaudistribuee
) )
} }
else{
if(explorer_SelectSage == "Tous"){
matrice %>%
dplyr::filter(
# nom_sage %in% explorer_SelectSage,
dplyr::between(as.numeric(as.character(annee_prelevement)), explorer_SelectAnnee[1], explorer_SelectAnnee[2]),
resultat_analyse >= explorer_SelectConcentrationmin
) %>%
dplyr::select(
annee_prelevement, date_prelevement, code_station,libelle_station,insee_dep,
nom_parametre, code_remarque, resultat_analyse, Exigenceeaudistribuee
)
}
else{
matrice %>%
dplyr::filter(
nom_sage == explorer_SelectSage,
dplyr::between(as.numeric(as.character(annee_prelevement)), explorer_SelectAnnee[1], explorer_SelectAnnee[2]),
resultat_analyse >= explorer_SelectConcentrationmin
) %>%
dplyr::select(
annee_prelevement, date_prelevement, code_station,libelle_station,insee_dep,
nom_parametre, code_remarque, resultat_analyse, Exigenceeaudistribuee
)
}
}
} }
else{ else{
matrice %>% matrice %>%
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment