Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
data.nitrates
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DREAL Pays de la Loire
Centre de Services de la Donnée
Eau et milieux aquatiques
data.nitrates
Commits
aaaca39f
Commit
aaaca39f
authored
1 year ago
by
ronan.vignard
Browse files
Options
Downloads
Patches
Plain Diff
Passage en version 0.1.0 : finalisation de la vignette "Import des données brutes ARS"
parent
06743a74
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!4
Passage en version 0.1.0 : finalisation de la vignette "Import des données brutes ARS"
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
DESCRIPTION
+1
-1
1 addition, 1 deletion
DESCRIPTION
NEWS.md
+2
-2
2 additions, 2 deletions
NEWS.md
dev/flat_import_ars_data.Rmd
+24
-22
24 additions, 22 deletions
dev/flat_import_ars_data.Rmd
vignettes/import-des-donnees-brutes-ars.Rmd
+22
-11
22 additions, 11 deletions
vignettes/import-des-donnees-brutes-ars.Rmd
with
49 additions
and
36 deletions
DESCRIPTION
+
1
−
1
View file @
aaaca39f
Package: data.nitrates
Package: data.nitrates
Title: Collecte Des Données Sur Les Nitrates
Title: Collecte Des Données Sur Les Nitrates
Version: 0.
0.0.900
0
Version: 0.
1.
0
Authors@R:
Authors@R:
person("Ronan", "Vignard", , "ronan.vignard@developpement-durable.gouv.fr", role = c("aut", "cre"),
person("Ronan", "Vignard", , "ronan.vignard@developpement-durable.gouv.fr", role = c("aut", "cre"),
comment = c(ORCID = "0000-0000-0000-0000"))
comment = c(ORCID = "0000-0000-0000-0000"))
...
...
This diff is collapsed.
Click to expand it.
NEWS.md
+
2
−
2
View file @
aaaca39f
# data.nitrates
(development version)
# data.nitrates
0.1.0
*
Initial CRAN submission.
*
Finalisation de la vignette "Import des données brutes ARS"
This diff is collapsed.
Click to expand it.
dev/flat_import_ars_data.Rmd
+
24
−
22
View file @
aaaca39f
...
@@ -5,15 +5,6 @@ editor_options:
...
@@ -5,15 +5,6 @@ editor_options:
chunk_output_type: console
chunk_output_type: console
---
---
```{r development, include=FALSE}
library(testthat)
```
```{r development-load}
# Load already included functions if relevant
pkgload::load_all(export_all = FALSE)
```
```{r development, include=FALSE}
```{r development, include=FALSE}
library(testthat)
library(testthat)
library(xlsx)
library(xlsx)
...
@@ -24,8 +15,8 @@ library(collectr)
...
@@ -24,8 +15,8 @@ library(collectr)
library(dplyr)
library(dplyr)
```
```
```{r development-
1
}
```{r development-
load
}
# Load already included functions
# Load already included functions
if relevant
pkgload::load_all(export_all = FALSE)
pkgload::load_all(export_all = FALSE)
```
```
...
@@ -76,14 +67,6 @@ tables_list <- tables_list |>
...
@@ -76,14 +67,6 @@ tables_list <- tables_list |>
Les données sont transmies au format XLSX.
Les données sont transmies au format XLSX.
```{r import_data_ars_2022, eval=FALSE}
data_ars_2022 <- collectr::import_xlsx(
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2023_06\\Nitrates 2022 pour DREAL EPNT4 2023-05-30.xlsx",
sheet = 1,
row = 2)
```
```{r import_data_ars_2023, eval=FALSE}
```{r import_data_ars_2023, eval=FALSE}
data_ars_2023 <- collectr::import_xlsx(
data_ars_2023 <- collectr::import_xlsx(
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2024_06\\Nitrates 2023 pour DREAL EPNT4 2024-05-31.xlsx",
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2024_06\\Nitrates 2023 pour DREAL EPNT4 2024-05-31.xlsx",
...
@@ -125,16 +108,35 @@ collectr::modify_column_type(database = "si_eau",
...
@@ -125,16 +108,35 @@ collectr::modify_column_type(database = "si_eau",
```
```
# Archivage de la version précédente de la table
```{r archive_table, eval=FALSE}
# Archiver la version actuelle de la table avec tous les millésimes
collectr::archive_table(database = "si_eau",
schema = "nitrates",
new_schema = "zz_archives",
table = "nitrate_data_analyse_ars",
role = "admin")
```
# Insertion des données du nouveau millésime en base dans la table globale
# Insertion des données du nouveau millésime en base dans la table globale
```{r import_and_merge_tables, eval=FALSE}
```{r import_and_merge_tables, eval=FALSE}
# Insérer les données de la table du dernier millésime vers la table complète
# Insérer les données de la table du dernier millésime vers la table complète
collectr::import_and_merge_tables(database = "si_eau",
collectr::import_and_merge_tables(database = "si_eau",
source_table = "nitrate_data_ars_2023",
source_table = "nitrate_data_
analyse_
ars_2023",
source_schema = "nitrates",
source_schema = "nitrates",
target_table = "nitrate_data_analyse_ars_test",
target_table = "nitrate_data_analyse_ars",
target_schema = "nitrates")
target_schema = "nitrates",
role = "admin")
# Actualiser le commentaire sur la table
datalibaba::commenter_table(comment = "Analyses Nitrates ARS (2007-2023)",
table = "nitrate_data_analyse_ars",
schema = "nitrates",
db = "si_eau",
user = "admin")
```
```
```{r development-inflate, eval=FALSE}
```{r development-inflate, eval=FALSE}
...
...
This diff is collapsed.
Click to expand it.
vignettes/import-des-donnees-brutes-ars.Rmd
+
22
−
11
View file @
aaaca39f
...
@@ -69,14 +69,6 @@ tables_list <- tables_list |>
...
@@ -69,14 +69,6 @@ tables_list <- tables_list |>
Les données sont transmies au format XLSX.
Les données sont transmies au format XLSX.
```{r import_data_ars_2022, eval = FALSE}
data_ars_2022 <- collectr::import_xlsx(
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2023_06\\Nitrates 2022 pour DREAL EPNT4 2023-05-30.xlsx",
sheet = 1,
row = 2)
```
```{r import_data_ars_2023, eval = FALSE}
```{r import_data_ars_2023, eval = FALSE}
data_ars_2023 <- collectr::import_xlsx(
data_ars_2023 <- collectr::import_xlsx(
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2024_06\\Nitrates 2023 pour DREAL EPNT4 2024-05-31.xlsx",
filepath = "T:\\datalab\\SRNP_DEMA_SI_EAU\\NITRATES\\DONNEES_CLIENT\\SOURCES\\ARS\\2024_06\\Nitrates 2023 pour DREAL EPNT4 2024-05-31.xlsx",
...
@@ -118,15 +110,34 @@ collectr::modify_column_type(database = "si_eau",
...
@@ -118,15 +110,34 @@ collectr::modify_column_type(database = "si_eau",
```
```
# Archivage de la version précédente de la table
```{r archive_table, eval = FALSE}
# Archiver la version actuelle de la table avec tous les millésimes
collectr::archive_table(database = "si_eau",
schema = "nitrates",
new_schema = "zz_archives",
table = "nitrate_data_analyse_ars",
role = "admin")
```
# Insertion des données du nouveau millésime en base dans la table globale
# Insertion des données du nouveau millésime en base dans la table globale
```{r import_and_merge_tables, eval = FALSE}
```{r import_and_merge_tables, eval = FALSE}
# Insérer les données de la table du dernier millésime vers la table complète
# Insérer les données de la table du dernier millésime vers la table complète
collectr::import_and_merge_tables(database = "si_eau",
collectr::import_and_merge_tables(database = "si_eau",
source_table = "nitrate_data_ars_2023",
source_table = "nitrate_data_
analyse_
ars_2023",
source_schema = "nitrates",
source_schema = "nitrates",
target_table = "nitrate_data_analyse_ars_test",
target_table = "nitrate_data_analyse_ars",
target_schema = "nitrates")
target_schema = "nitrates",
role = "admin")
# Actualiser le commentaire sur la table
datalibaba::commenter_table(comment = "Analyses Nitrates ARS (2007-2023)",
table = "nitrate_data_analyse_ars",
schema = "nitrates",
db = "si_eau",
user = "admin")
```
```
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment