From 352c4c44adbb58af6ad38c956831297196e72ec0 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Thu, 28 Mar 2024 16:24:17 +0100 Subject: [PATCH 1/6] no message --- be/app/Http/Controllers/MasterTaskController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 8a63d88..bfd6622 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -18,7 +18,7 @@ class MasterTaskController extends Controller $parameters = $request->query(); - $mastertasks = MasterTask::select('*'); + $mastertasks = MasterTask::select('id', 'title', 'project_id', 'color'); // filtrovanie na zaklade parametrov foreach ($parameters as $field => $value) { @@ -35,7 +35,7 @@ class MasterTaskController extends Controller ->orWhereDate('deadline', '>=', $parameters['year'] . '-' . $parameters['month'] . '-01'); }); - + // $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') // ->orWhereDate('deadline', '>=', // $parameters['year'] . '-' . $parameters['month'] . '-01'); From 06607653d2cce63212e057be094b6ff9af8cf2ce Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Thu, 28 Mar 2024 16:29:32 +0100 Subject: [PATCH 2/6] no message --- be/app/Http/Controllers/MasterTaskController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index bfd6622..8aa1892 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Http\Resources\MasterTaskResource; use App\Http\Resources\MasterTaskSimpleResource; use App\Models\Attachment; use App\Models\MasterTask; @@ -77,7 +76,7 @@ class MasterTaskController extends Controller $mastertasks = $mastertasks->get(); return response()->json([ - 'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskResource::collection($mastertasks) + 'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskSimpleResource::collection($mastertasks) ], 200); } From 36437c92ecccebcfa89bdcfdacadd9fe19c65c21 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Tue, 2 Apr 2024 10:12:54 +0200 Subject: [PATCH 3/6] no message --- be/app/Http/Controllers/MasterTaskController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 8aa1892..8bd8195 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -17,7 +17,8 @@ class MasterTaskController extends Controller $parameters = $request->query(); - $mastertasks = MasterTask::select('id', 'title', 'project_id', 'color'); + $mastertasks = MasterTask::select('id', 'title', 'project_id', 'color', 'created_at', 'deadline', + 'is_finished'); // filtrovanie na zaklade parametrov foreach ($parameters as $field => $value) { From 611f028121e37740db765342fdc2123841575c5d Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Tue, 2 Apr 2024 10:16:18 +0200 Subject: [PATCH 4/6] no message --- be/app/Http/Resources/MasterTaskSimpleResource.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/be/app/Http/Resources/MasterTaskSimpleResource.php b/be/app/Http/Resources/MasterTaskSimpleResource.php index c1ff532..f0ff047 100644 --- a/be/app/Http/Resources/MasterTaskSimpleResource.php +++ b/be/app/Http/Resources/MasterTaskSimpleResource.php @@ -10,15 +10,19 @@ class MasterTaskSimpleResource extends JsonResource * Transform the resource into an array. * * @param \Illuminate\Http\Request $request + * * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { return [ - 'id' => $this->id, - 'name' => $this->title, - 'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null, - 'color' => $this->color, + 'id' => $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, ]; } } From 5c93fb2918abf2cc1d9187dafcbd53d66bd397a4 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Tue, 2 Apr 2024 10:22:01 +0200 Subject: [PATCH 5/6] 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, ]; } } From ef8ebfd6198da4209d518199a2905f109db4756e Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Thu, 4 Apr 2024 09:23:00 +0200 Subject: [PATCH 6/6] no message --- be/app/Http/Controllers/MasterTaskController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index b283cf5..aff472a 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -37,9 +37,6 @@ class MasterTaskController extends Controller $parameters['year'] . '-' . $parameters['month'] . '-01'); }); -// $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') -// ->orWhereDate('deadline', '>=', -// $parameters['year'] . '-' . $parameters['month'] . '-01'); break; case 'employee_id':