Timon/SmartCane
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

worked with timon to harmonize report output

Browse source
This commit is contained in:
Martin Folkerts 2024-02-08 13:53:35 +01:00
parent 2c1d70e0a6
commit a990560400
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
laravel_app/app/Jobs/ProjectMosiacGeneratorJob.php
View file

@ -21,7 +21,7 @@ class ProjectMosiacGeneratorJob implements ShouldQueue
public ProjectMosaic $mosaic; public ProjectMosaic $mosaic;
protected $timeout = 120; protected $timeout = 220;
/** /**
* Create a new job instance. * Create a new job instance.
@ -47,7 +47,7 @@ public function handle(): void
$process = new Process($command); $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'; $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']);

1
laravel_app/app/Livewire/Projects/ReportManager.php
View file

@ -69,6 +69,7 @@ public function getDateRangeProperty()
if (empty($this->formData['week']) || strlen($this->formData['year']) !== 4) { if (empty($this->formData['week']) || strlen($this->formData['year']) !== 4) {
return '<span class="text-red-500">Invalid week or year</span>'; return '<span class="text-red-500">Invalid week or year</span>';
} }
// @TODO dit moet gecorrigeerd voor de project settings;
$begin = now() $begin = now()
->setISODate($this->formData['year'], $this->formData['week']) ->setISODate($this->formData['year'], $this->formData['week'])
->startOfWeek(); ->startOfWeek();

8
laravel_app/database/seeders/DatabaseSeeder.php
View file

@ -79,7 +79,7 @@ private function createChembaProject()
'updated_at' => '2021-01-01 00:00:00', 'updated_at' => '2021-01-01 00:00:00',
], [ ], [
'name' => 'Timon Weitkamp', 'name' => 'Timon Weitkamp',
'email' => 'timon@smartfarmingtech.com', 'email' => 'timon@resiliencebv.com',
'created_at' => '2021-01-01 00:00:00', 'created_at' => '2021-01-01 00:00:00',
'updated_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, 'updated_at' => $mailing->updated_at,
], [ ], [
'name' => 'Timon Weitkamp', 'name' => 'Timon Weitkamp',
'email' => 'timon@smartfarmingtech.com', 'email' => 'timon@resiliencebv.com',
'created_at' => $mailing->created_at, 'created_at' => $mailing->created_at,
'updated_at' => $mailing->updated_at, 'updated_at' => $mailing->updated_at,
], ],
@ -174,7 +174,7 @@ private function createXinavaneProject()
'updated_at' => '2021-01-01 00:00:00', 'updated_at' => '2021-01-01 00:00:00',
], [ ], [
'name' => 'Timon Weitkamp', 'name' => 'Timon Weitkamp',
'email' => 'timon@smartfarmingtech.com', 'email' => 'timon@resiliencebv.com',
'created_at' => '2021-01-01 00:00:00', 'created_at' => '2021-01-01 00:00:00',
'updated_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, 'updated_at' => $mailing->updated_at,
], [ ], [
'name' => 'Timon Weitkamp', 'name' => 'Timon Weitkamp',
'email' => 'timon@smartfarmingtech.com', 'email' => 'timon@resiliencebv.com',
'created_at' => $mailing->created_at, 'created_at' => $mailing->created_at,
'updated_at' => $mailing->updated_at, 'updated_at' => $mailing->updated_at,
], ],