From 5c93fb2918abf2cc1d9187dafcbd53d66bd397a4 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Tue, 2 Apr 2024 10:22:01 +0200 Subject: [PATCH] no message --- .../Http/Controllers/MasterTaskController.php | 3 +- .../MasterTaskProjectCalendarResource.php | 29 +++++++++++++++++++ .../Resources/MasterTaskSimpleResource.php | 3 -- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 be/app/Http/Resources/MasterTaskProjectCalendarResource.php diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 8bd8195..b283cf5 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Http\Resources\MasterTaskProjectCalendarResource; use App\Http\Resources\MasterTaskSimpleResource; use App\Models\Attachment; use App\Models\MasterTask; @@ -77,7 +78,7 @@ class MasterTaskController extends Controller $mastertasks = $mastertasks->get(); return response()->json([ - 'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskSimpleResource::collection($mastertasks) + 'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskProjectCalendarResource::collection($mastertasks) ], 200); } diff --git a/be/app/Http/Resources/MasterTaskProjectCalendarResource.php b/be/app/Http/Resources/MasterTaskProjectCalendarResource.php new file mode 100644 index 0000000..cf24ee4 --- /dev/null +++ b/be/app/Http/Resources/MasterTaskProjectCalendarResource.php @@ -0,0 +1,29 @@ + $this->id, + 'name' => $this->title, + 'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null, + 'color' => $this->color, + 'deadline' => $this->deadline, + 'starts_at' => $this->created_at, + 'is_finished' => $this->is_finished, + + ]; + } +} diff --git a/be/app/Http/Resources/MasterTaskSimpleResource.php b/be/app/Http/Resources/MasterTaskSimpleResource.php index f0ff047..ea427a0 100644 --- a/be/app/Http/Resources/MasterTaskSimpleResource.php +++ b/be/app/Http/Resources/MasterTaskSimpleResource.php @@ -20,9 +20,6 @@ class MasterTaskSimpleResource extends JsonResource 'name' => $this->title, 'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null, 'color' => $this->color, - 'deadline' => $this->deadline, - 'starts_at' => $this->created_at, - 'is_finished' => $this->is_finished, ]; } }