removed chemba as a option from parameters so it is treathed as a regular project

This commit is contained in:
Martin Folkerts 2024-08-28 10:18:53 +02:00
parent 23ba088434
commit 2598306643
9 changed files with 5 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

View file

@ -18,7 +18,7 @@ class ProjectReportGeneratorJob implements ShouldQueue
{ {
use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $timeout = 220; public $timeout = 600;
private ProjectReport $projectReport; private ProjectReport $projectReport;
private bool $sendMail; private bool $sendMail;
@ -54,7 +54,7 @@ public function handle()
// Convert commands array to a single string // Convert commands array to a single string
$process = new Process($command); $process = new Process($command);
$process->setTimeout(220); $process->setTimeout(600);
$currentPath = '/usr/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin/Users/mfolkerts/anaconda3/bin:/Library/Apple/usr/bin'; $currentPath = '/usr/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin/Users/mfolkerts/anaconda3/bin:/Library/Apple/usr/bin';
$process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']); $process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']);

Binary file not shown.

View file

@ -1,7 +1,7 @@
library('readxl') library('readxl')
#chemba #chemba
if(project_dir == "chemba"){ if(project_dir == "chemba1"){
message("Yield data for Chemba") message("Yield data for Chemba")
@ -89,8 +89,9 @@ if(project_dir == "chemba"){
} else { } else {
field_boundaries_sf <- st_read(here(data_dir, "pivot.geojson")) field_boundaries_sf <- st_read(here(data_dir, "pivot.geojson"))
head(field_boundaries_sf)
names(field_boundaries_sf) <- c("field", "sub_field", "geometry") names(field_boundaries_sf) <- c("field", "sub_field", "geometry")
field_boundaries <- field_boundaries_sf %>% vect() field_boundaries <- field_boundaries_sf %>% terra::vect()
harvesting_data <- read_excel(here(data_dir, "harvest.xlsx")) %>% harvesting_data <- read_excel(here(data_dir, "harvest.xlsx")) %>%
dplyr::select(c("field", "sub_field", "year", "season_start", "season_end", "age", "sub_area", "tonnage_ha")) %>% dplyr::select(c("field", "sub_field", "year", "season_start", "season_end", "age", "sub_area", "tonnage_ha")) %>%
mutate(field = as.character(field), mutate(field = as.character(field),