From 9e5eda027752fea91925e9542ede38d337755a1e Mon Sep 17 00:00:00 2001 From: guillaume91 Date: Wed, 19 Jun 2024 14:21:28 +0200 Subject: [PATCH] [fix] Mosaic name was not set in db. --- laravel_app/app/Livewire/Projects/Tabs/Mosaic.php | 3 ++- laravel_app/app/Models/ProjectMosaic.php | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/laravel_app/app/Livewire/Projects/Tabs/Mosaic.php b/laravel_app/app/Livewire/Projects/Tabs/Mosaic.php index a0cfd65..1b6cfc1 100644 --- a/laravel_app/app/Livewire/Projects/Tabs/Mosaic.php +++ b/laravel_app/app/Livewire/Projects/Tabs/Mosaic.php @@ -4,6 +4,7 @@ use App\Jobs\ProjectMosiacGeneratorJob; use App\Models\Project; +use App\Models\ProjectMosaic; use Carbon\Carbon; use Livewire\Component; use Livewire\WithPagination; @@ -38,7 +39,7 @@ public function saveMosaic() ]); $mosaic = $this->project->mosaics()->updateOrCreate([ - 'name' => sprintf('', $this->formData['end_date'], $this->formData['offset']), + 'name' => ProjectMosaic::projectMosaicNameFormat(new Carbon($this->formData['end_date']),(int) $this->formData['offset']), 'offset' => $this->formData['offset'], 'end_date' => $this->formData['end_date'], ], [ diff --git a/laravel_app/app/Models/ProjectMosaic.php b/laravel_app/app/Models/ProjectMosaic.php index 3c100b9..db2298f 100644 --- a/laravel_app/app/Models/ProjectMosaic.php +++ b/laravel_app/app/Models/ProjectMosaic.php @@ -32,6 +32,11 @@ public static function getFilenameByPeriod(Carbon $endDate,int $offset) return sprintf('period_%s_%s.tif',(clone $endDate)->subdays($offset)->format('Y-m-d'),$endDate->format('Y-m-d')); } + public static function projectMosaicNameFormat(Carbon $endDate,int $offset):string + { + return 'Period '.$endDate->copy()->subDays($offset)->toDateString().' - '.$endDate->toDateString(); + } + public function project() { return $this->belongsTo(Project::class);