From a9905604009cb4a51f38f9a7cddf1039011bab0f Mon Sep 17 00:00:00 2001 From: Martin Folkerts Date: Thu, 8 Feb 2024 13:53:35 +0100 Subject: [PATCH] worked with timon to harmonize report output --- laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php | 4 ++-- laravel_app/app/Livewire/Projects/ReportManager.php | 1 + laravel_app/database/seeders/DatabaseSeeder.php | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php b/laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php index 462eee5..82240c1 100644 --- a/laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php +++ b/laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php @@ -21,7 +21,7 @@ class ProjectMosiacGeneratorJob implements ShouldQueue public ProjectMosaic $mosaic; - protected $timeout = 120; + protected $timeout = 220; /** * Create a new job instance. @@ -47,7 +47,7 @@ public function handle(): void $process = new Process($command); - $process->setTimeout(120); + $process->setTimeout(220); $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']); diff --git a/laravel_app/app/Livewire/Projects/ReportManager.php b/laravel_app/app/Livewire/Projects/ReportManager.php index a4c0c92..cfbe9c3 100644 --- a/laravel_app/app/Livewire/Projects/ReportManager.php +++ b/laravel_app/app/Livewire/Projects/ReportManager.php @@ -69,6 +69,7 @@ public function getDateRangeProperty() if (empty($this->formData['week']) || strlen($this->formData['year']) !== 4) { return 'Invalid week or year'; } + // @TODO dit moet gecorrigeerd voor de project settings; $begin = now() ->setISODate($this->formData['year'], $this->formData['week']) ->startOfWeek(); diff --git a/laravel_app/database/seeders/DatabaseSeeder.php b/laravel_app/database/seeders/DatabaseSeeder.php index cb55d91..4372e52 100644 --- a/laravel_app/database/seeders/DatabaseSeeder.php +++ b/laravel_app/database/seeders/DatabaseSeeder.php @@ -79,7 +79,7 @@ private function createChembaProject() 'updated_at' => '2021-01-01 00:00:00', ], [ 'name' => 'Timon Weitkamp', - 'email' => 'timon@smartfarmingtech.com', + 'email' => 'timon@resiliencebv.com', 'created_at' => '2021-01-01 00:00:00', 'updated_at' => '2021-01-01 00:00:00', ], @@ -110,7 +110,7 @@ private function createChembaProject() 'updated_at' => $mailing->updated_at, ], [ 'name' => 'Timon Weitkamp', - 'email' => 'timon@smartfarmingtech.com', + 'email' => 'timon@resiliencebv.com', 'created_at' => $mailing->created_at, 'updated_at' => $mailing->updated_at, ], @@ -174,7 +174,7 @@ private function createXinavaneProject() 'updated_at' => '2021-01-01 00:00:00', ], [ 'name' => 'Timon Weitkamp', - 'email' => 'timon@smartfarmingtech.com', + 'email' => 'timon@resiliencebv.com', 'created_at' => '2021-01-01 00:00:00', 'updated_at' => '2021-01-01 00:00:00', ], @@ -205,7 +205,7 @@ private function createXinavaneProject() 'updated_at' => $mailing->updated_at, ], [ 'name' => 'Timon Weitkamp', - 'email' => 'timon@smartfarmingtech.com', + 'email' => 'timon@resiliencebv.com', 'created_at' => $mailing->created_at, 'updated_at' => $mailing->updated_at, ],