Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
collectr
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
Container 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
ADL
collectr
Commits
3377b631
Commit
3377b631
authored
6 months ago
by
ronan.vignard
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into 'master'
Passage en v0.1.3 See merge request dreal-pdl/csd/collectr!34
parents
ffa7bd2e
2c753f3e
No related branches found
No related tags found
1 merge request
!34
Passage en v0.1.3
Pipeline
#487277
passed
6 months ago
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
DESCRIPTION
+1
-1
1 addition, 1 deletion
DESCRIPTION
NEWS.md
+6
-0
6 additions, 0 deletions
NEWS.md
dev/flat_utils.Rmd
+0
-6
0 additions, 6 deletions
dev/flat_utils.Rmd
with
7 additions
and
7 deletions
DESCRIPTION
+
1
−
1
View file @
3377b631
Package: collectr
Title: Easy File Import
Version: 0.1.
2
Version: 0.1.
3
Authors@R:
person("Ronan", "Vignard", , "ronan.vignard@developpement-durable.gouv.fr", role = c("aut", "cre"),
comment = c(ORCID = "0000-0000-0000-0000"))
...
...
This diff is collapsed.
Click to expand it.
NEWS.md
+
6
−
0
View file @
3377b631
# collectr 0.1.3
*
Remplacement de la librairie
`xlsx`
par
`readxl`
*
Ajout de l'option
`ecoSQL=FALSE`
à l'appel de la fonction
`datalibaba::connect_db()`
*
Remplacement de
`DBI::dbSendQuery`
par
`DBI::dbSendStatement`
dans la fonction
`archive_table()`
# collectr 0.1.2
*
Résolution du bug sur la fonction
`import_and_merge_tables()`
...
...
This diff is collapsed.
Click to expand it.
dev/flat_utils.Rmd
+
0
−
6
View file @
3377b631
...
...
@@ -186,20 +186,14 @@ fix_encoding_variable <- function(data, variable) {
```
```{r example-fix_encoding_variable, eval=FALSE}
<<<<<<< HEAD
#' \dontrun{
=======
>>>>>>> master
# Utilisation de la fonction fix_encoding_variable()
nitrate_analyse_esu_2023 <- fix_encoding_variable(nitrate_analyse_esu_2023,
"libelle_station")
# Vérification de l'encodage corrigé
head(nitrate_analyse_esu_2023$libelle_station)
<<<<<<< HEAD
#' }
=======
>>>>>>> master
```
...
...
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