Skip to content
Snippets Groups Projects
Commit 328e9b14 authored by ronan.vignard's avatar ronan.vignard
Browse files

Merge branch 'dev' into 'main'

Correction d'un bug bloquant le chargement des données

See merge request dreal-pdl/csd/suivi-avis-ae!18
parents b1c7a6a0 0482c18e
No related branches found
No related tags found
1 merge request!18Correction d'un bug bloquant le chargement des données
...@@ -32,4 +32,4 @@ Config/testthat/edition: 3 ...@@ -32,4 +32,4 @@ Config/testthat/edition: 3
Encoding: UTF-8 Encoding: UTF-8
Language: en-US Language: en-US
LazyData: true LazyData: true
RoxygenNote: 7.2.3 RoxygenNote: 7.3.1
...@@ -24,14 +24,16 @@ app_server <- function(input, output, session) { ...@@ -24,14 +24,16 @@ app_server <- function(input, output, session) {
r_global$df_type_consultation <- datalibaba::importer_data( r_global$df_type_consultation <- datalibaba::importer_data(
db = "metier", db = "metier",
schema = "avis_ae", schema = "avis_ae",
table = "type_consultation") table = "type_consultation",
user = "dreal")
observe({ observe({
# Données exportées de GARANCE et filtrées # Données exportées de GARANCE et filtrées
r_global$df_export_garance <- datalibaba::importer_data( r_global$df_export_garance <- datalibaba::importer_data(
db = "metier", db = "metier",
schema = "avis_ae", schema = "avis_ae",
table = "export_garance") |> table = "export_garance",
user = "dreal") |>
dplyr::filter( dplyr::filter(
type_consultation %in% r_global$df_type_consultation$identifiant, type_consultation %in% r_global$df_type_consultation$identifiant,
annee > 2015) annee > 2015)
...@@ -41,12 +43,14 @@ app_server <- function(input, output, session) { ...@@ -41,12 +43,14 @@ app_server <- function(input, output, session) {
r_global$df_departement <- datalibaba::importer_data( r_global$df_departement <- datalibaba::importer_data(
db = "referentiels", db = "referentiels",
schema = "adminexpress", schema = "adminexpress",
table = "n_departement_exp_r52") |> sf::st_transform(4326) table = "n_departement_exp_r52",
user = "dreal") |> sf::st_transform(4326)
r_global$df_region <- datalibaba::importer_data( r_global$df_region <- datalibaba::importer_data(
db = "referentiels", db = "referentiels",
schema = "adminexpress", schema = "adminexpress",
table = "n_region_exp_r52") |> sf::st_transform(4326) table = "n_region_exp_r52",
user = "dreal") |> sf::st_transform(4326)
mod_sidebar_server("sidebar_1") mod_sidebar_server("sidebar_1")
mod_main_server("main_1", r_global = r_global) mod_main_server("main_1", r_global = r_global)
......
...@@ -32,7 +32,8 @@ create_map <- function(table_name, ...@@ -32,7 +32,8 @@ create_map <- function(table_name,
data <- datalibaba::importer_data( data <- datalibaba::importer_data(
db = "metier", db = "metier",
schema = "avis_ae", schema = "avis_ae",
table = table_name) |> sf::st_transform(4326) table = table_name,
user = "dreal") |> sf::st_transform(4326)
# Préparer la jointure par l'ajout de la variable numero # Préparer la jointure par l'ajout de la variable numero
data <- data |> dplyr::mutate(numero = id_dossier) data <- data |> dplyr::mutate(numero = id_dossier)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment