From eb2a75c362bc4fc4726c21c438e7c98bfbb60fe9 Mon Sep 17 00:00:00 2001 From: LE DURAND Matteo <matteo.le-durand@developpement-durable.gouv.fr> Date: Tue, 1 Apr 2025 15:39:57 +0200 Subject: [PATCH] =?UTF-8?q?l'annuaire=20est=20charg=C3=A9e=20automatiqueme?= =?UTF-8?q?nt=20et=20charger=20dans=20le=20global=20automatiquement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev/chargement_annuaire.R | 13 +++++++++++++ dev/script_routine.R | 13 ++----------- global.R | 3 +-- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 dev/chargement_annuaire.R diff --git a/dev/chargement_annuaire.R b/dev/chargement_annuaire.R new file mode 100644 index 0000000..68cef32 --- /dev/null +++ b/dev/chargement_annuaire.R @@ -0,0 +1,13 @@ +library(stringr) +library(lubridate) +library(readr) +path_annuaire <- paste0("annuaire/export_pauline_", str_sub(today(), 1, 7), ".csv") +if (!file.exists(path_annuaire)) { + unlink("annuaire", recursive = TRUE) + dir.create("annuaire") + download.file(url = "http://annuaire.e2.rie.gouv.fr/index.php?vue=exportcsv&dn=ou=CSD,ou=SCTE,ou=DREAL%20Pays%20Loire,ou=DR,ou=melanie", + destfile = path_annuaire, method = "libcurl") +} +annuaire <- readr::read_csv(path_annuaire,col_types = "c") + +save.image(file = "path_annuaire.RData") diff --git a/dev/script_routine.R b/dev/script_routine.R index dbccb50..9ff8df4 100644 --- a/dev/script_routine.R +++ b/dev/script_routine.R @@ -4,21 +4,12 @@ Sys.setenv("NO_PROXY" = "127.0.0.1,localhost,.i2,.rie.gouv.fr,192.168.,10.,172." setwd("T:\\datalab\\SCTE_CSD\\dataviz_gitlabr") -library(stringr) -library(lubridate) + # etape de mise à jour des données sur T------------- source(file = "dev/github_extraire.R") source(file = "dev/gitlab_classique.R") source(file = "dev/gitlab_forge.R") - -path_annuaire <- paste0("annuaire/export_pauline_", str_sub(today(), 1, 7), ".csv") -if (!file.exists(path_annuaire)) { - unlink("annuaire", recursive = TRUE) - dir.create("annuaire") - download.file(url = "http://annuaire.e2.rie.gouv.fr/index.php?vue=exportcsv&dn=ou=CSD,ou=SCTE,ou=DREAL%20Pays%20Loire,ou=DR,ou=melanie", - destfile = path_annuaire, method = "libcurl") -} -save(path_annuaire,file = "path_annuaire.RData") +source(file = "dev/annuaire.R") source(file = "dev/deploiment_sur_dataviz.R", verbose = TRUE) diff --git a/global.R b/global.R index dd1e76c..daf09d7 100644 --- a/global.R +++ b/global.R @@ -20,7 +20,6 @@ library(bizdays) library(shinyWidgets) library(textclean) library(stringi) -library(readr) library(fuzzyjoin) # chargement des données (résultat du script "dev/script_chargement_rdata.R") load("github.RData") @@ -29,7 +28,7 @@ load("gitlab.RData") load("date_MAJ.RData") load("path_annuaire.RData") -annuaire <- readr::read_csv(path_annuaire,col_types = "c") + annuaire$Messagerie <- tolower(annuaire$Messagerie) annuaire <- annuaire %>% dplyr::rename( mail = Messagerie) annuaire <- annuaire %>% dplyr::filter( stringr::str_detect(Unité,"CSD" ) ) -- GitLab