From 2a872cf8a3dce0deb197d201c2e395656aff4382 Mon Sep 17 00:00:00 2001 From: Martin Folkerts Date: Tue, 17 Oct 2023 11:08:44 +0200 Subject: [PATCH] wip --- r_app/CI_report_dashboard_planet.Rmd | 4 +++- smartcane.sh | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/r_app/CI_report_dashboard_planet.Rmd b/r_app/CI_report_dashboard_planet.Rmd index 8867796..94dfc3e 100644 --- a/r_app/CI_report_dashboard_planet.Rmd +++ b/r_app/CI_report_dashboard_planet.Rmd @@ -1,8 +1,10 @@ --- # title: paste0("CI report week ", week, " - all pivots from ", last_tuesday, " to ", today) +params: + ref: word-styles-reference-03.docx output: word_document: - reference_docx: "/Users/mfolkerts/smartCane/word-styles-reference-03.docx" + reference_docx: !expr file.path("word-styles-reference-03.docx") # toc: true editor_options: chunk_output_type: console diff --git a/smartcane.sh b/smartcane.sh index cfeb53b..3a46f94 100755 --- a/smartcane.sh +++ b/smartcane.sh @@ -46,7 +46,8 @@ else fi # Hier kan je verdere stappen toevoegen, zoals het uitvoeren van je Python-script of Jupyter Notebook -#jupyter nbconvert --execute --to script --stdout python_app/Chemba_download.ipynb +jupyter nbconvert --execute --to script --stdout python_app/Chemba_download.ipynb + # Deactiveer de virtuele omgeving (optioneel) deactivate ## Runnen van R scripts @@ -56,7 +57,7 @@ cp "Current - Pivots planting date and harevsting data.xlsx" "laravel_app/storag cp "pivot_20210625.geojson" "laravel_app/storage/app/Data" cd r_app Rscript 1_harvest_data_EcoFarm_v2.R -Rscript 2_CI_data_prep.R +Rscript 2_CI_data_prep.Ra # ## Runnen van Rmd bestand # -e betekent "evalueren" en -i specificeert de input file