Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare next release #34

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
a5efc60
Extract common parts of aggregate_export_fst_* functions
hsonne Nov 11, 2021
253b0f4
Use range() to calculate min and max at the same time
hsonne Nov 11, 2021
549aa68
Merge branch 'master' into clean
hsonne Nov 12, 2021
45f80a4
Use functions to provide configurational data
hsonne Nov 12, 2021
6a4c397
Improve configuration of operational parameter calculation
hsonne Nov 12, 2021
ae20732
Write configurational data to yaml files
hsonne Nov 12, 2021
0838211
Check if configurations can be reproced from yml files
hsonne Nov 12, 2021
d5a1f4b
Do not configure operational data calculation in script
hsonne Nov 12, 2021
22922f2
Remove one layer of functions. Add argument "config"
hsonne Nov 12, 2021
4b497c4
Consequently use shiny_file()
hsonne Nov 12, 2021
61d35cd
Add dependency on package "yaml"
hsonne Nov 12, 2021
eddbc4e
Use integer constants, count based on logical vector
hsonne Nov 12, 2021
7b0cf40
Improve indentation, use kwb.utils::noFactorDataFrame()
hsonne Nov 12, 2021
54e9495
Improve indentation, reuse number of rows in "n_rows"
hsonne Nov 12, 2021
e22368c
Improve indentation, remove empty lines, simplify names
hsonne Nov 12, 2021
4d634ad
Use kwb.utils::noFactorDataFrame()
hsonne Nov 12, 2021
920c8c6
Clean get_monthly_periods.R
hsonne Nov 12, 2021
2945e17
Clean get_thresholds.R
hsonne Nov 12, 2021
b8c7d5f
Clean group_datetime.R
hsonne Nov 12, 2021
2ab85f4
Clean import_analytics_haridwar.R
hsonne Nov 12, 2021
e010549
Clean import_data_basel.R
hsonne Nov 12, 2021
e7bd602
Clean import_data_berlin_f.R
hsonne Nov 12, 2021
a600a46
Clean import_data_haridwar.R
hsonne Nov 12, 2021
dff7f19
Clean import_operation_berlin_s.R
hsonne Nov 12, 2021
7523b99
Clean import_operation_berlin_t.R
hsonne Nov 12, 2021
e6e1e47
Clean import_operation_haridwar.R
hsonne Nov 12, 2021
dffea6e
Clean merge_and_export_fst.R
hsonne Nov 12, 2021
0e66ffe
Clean read_fst.R
hsonne Nov 12, 2021
08cd60d
Clean read_mbr4.R
hsonne Nov 12, 2021
226c982
Clean read_weintek.R
hsonne Nov 12, 2021
6b9d3de
Clean remove_duplicate.R
hsonne Nov 12, 2021
7fd3e4d
Clean report_batch.R
hsonne Nov 12, 2021
271d06c
Clean report_configuration.R
hsonne Nov 12, 2021
dd7ef0d
Clean run_shiny.R
hsonne Nov 12, 2021
00fd5d7
Clean tidy_mbr4_data.R
hsonne Nov 12, 2021
22ede61
Clean timezone.R
hsonne Nov 12, 2021
a04a85b
Clean utils.R
hsonne Nov 12, 2021
dbe11e5
Fix bug in read_pentair_data()?
hsonne Nov 12, 2021
da82147
Manually trigger influxdb run "on push"
mrustl Oct 25, 2022
f580b72
Reindent, trigger GitHub Actions
hsonne Mar 14, 2023
2801786
Reindent
hsonne Sep 14, 2023
fbf6a38
Merge dev into clean, solve conflicts
hsonne Sep 14, 2023
1c6a8bb
Reindent
hsonne Sep 14, 2023
a97d46f
Update documentation files
hsonne Sep 14, 2023
ce9d09b
Merge branch 'dev' into fix-read-pentair-data
Sep 14, 2023
7f2e06e
Improve indentation
hsonne Sep 14, 2023
af168e3
Merge branch 'master' into dev
Sep 14, 2023
d770bba
Merge branch 'dev' into clean
Sep 14, 2023
1cf854d
Try to skip vignette mbr40.Rmd
hsonne Sep 14, 2023
9a8334f
Do not run failing example
hsonne Sep 14, 2023
c85558f
Use kwb.pilot:::shiny_file() where appropriate
hsonne Sep 14, 2023
e6d3bcc
Try to fix error about missing check_tzones()
hsonne Sep 14, 2023
ac9c0aa
Consider renamed function in base package
hsonne Sep 14, 2023
c6756da
Use .data instead of .
hsonne Sep 14, 2023
1ac9047
Merge branch 'dev' into fix-read-pentair-data
Sep 15, 2023
3300c0e
Do not evaluate code in vignette mbr40.Rmd
hsonne Sep 15, 2023
f2382c5
Do not run failing example, update Rd files
hsonne Sep 15, 2023
91bbf8a
Use either check_tzones() or .check_tzones()
hsonne Sep 15, 2023
995fe7d
Replace . with .data to get rid of check NOTE
hsonne Sep 15, 2023
677f57c
Merge pull request #18 from KWB-R/fix-read-pentair-data
hsonne Sep 15, 2023
a4d662e
Fix conflicts, clean read_pentair_data()
hsonne Sep 15, 2023
6bab20a
Further clean import_operation_berlin_t.R
hsonne Sep 15, 2023
48d71b0
Merge pull request #17 from KWB-R/clean
hsonne Sep 15, 2023
9592795
Add aggregate_export_fst() to _pkgdown.yml
hsonne Sep 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ultimate_write_to_influxdbcloud.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Import Pilot Data From Nextcloud and Upload to InfluxDB Cloud
on:
push:
branches:
- main
- master
- dev
schedule:
# * is a special character in YAML so you have to quote this string
# Run this job every day at 00:00 am UTC ('0 0 * * *')
Expand Down
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ Imports:
tidyselect (>= 1.1.1),
withr (>= 2.3.0),
xml2 (>= 1.3.2),
xts (>= 0.12.1)
xts (>= 0.12.1),
yaml
Suggests:
covr (>= 3.5.1),
knitr (>= 1.30),
Expand All @@ -69,4 +70,4 @@ Remotes:
Config/testthat/edition: 3
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export("%>%")
export(add_label)
export(add_parameter_metadata)
export(add_site_metadata)
export(aggregate_export_fst)
export(aggregate_export_fst_berlin_f)
export(aggregate_export_fst_berlin_s)
export(aggregate_export_fst_berlin_t)
Expand Down Expand Up @@ -114,6 +115,7 @@ importFrom(kwb.nextcloud,download_files)
importFrom(kwb.nextcloud,list_files)
importFrom(kwb.nextcloud,move_file_or_folder)
importFrom(kwb.utils,catAndRun)
importFrom(kwb.utils,noFactorDataFrame)
importFrom(kwb.utils,stringList)
importFrom(lubridate,ceiling_date)
importFrom(lubridate,days)
Expand Down Expand Up @@ -158,3 +160,4 @@ importFrom(utils,write.csv)
importFrom(withr,with_dir)
importFrom(xml2,read_html)
importFrom(xts,align.time)
importFrom(yaml,read_yaml)
Loading