removed chemba as a option from parameters so it is treathed as a regular project
This commit is contained in:
parent
23ba088434
commit
2598306643
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 |
|
|
@ -18,7 +18,7 @@ class ProjectReportGeneratorJob implements ShouldQueue
|
|||
{
|
||||
use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||
|
||||
public $timeout = 220;
|
||||
public $timeout = 600;
|
||||
private ProjectReport $projectReport;
|
||||
private bool $sendMail;
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ public function handle()
|
|||
// Convert commands array to a single string
|
||||
|
||||
$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';
|
||||
|
||||
$process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']);
|
||||
|
|
|
|||
BIN
r_app/Rplots.pdf
BIN
r_app/Rplots.pdf
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
library('readxl')
|
||||
#chemba
|
||||
if(project_dir == "chemba"){
|
||||
if(project_dir == "chemba1"){
|
||||
message("Yield data for Chemba")
|
||||
|
||||
|
||||
|
|
@ -89,8 +89,9 @@ if(project_dir == "chemba"){
|
|||
|
||||
} else {
|
||||
field_boundaries_sf <- st_read(here(data_dir, "pivot.geojson"))
|
||||
head(field_boundaries_sf)
|
||||
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")) %>%
|
||||
dplyr::select(c("field", "sub_field", "year", "season_start", "season_end", "age", "sub_area", "tonnage_ha")) %>%
|
||||
mutate(field = as.character(field),
|
||||
|
|
|
|||
Loading…
Reference in a new issue