Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production

be/app/Http/Controllers/MasterTaskController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\MasterTaskResource;
+use App\Http\Resources\MasterTaskProjectCalendarResource;
 use App\Http\Resources\MasterTaskSimpleResource;
 use App\Models\Attachment;
 use App\Models\MasterTask;
@@ -18,7 +18,8 @@ class MasterTaskController extends Controller
         $parameters = $request->query();
 
 
-        $mastertasks = MasterTask::select('*');
+        $mastertasks = MasterTask::select('id', 'title', 'project_id', 'color', 'created_at', 'deadline',
+            'is_finished');
 
         // filtrovanie na zaklade parametrov
         foreach ($parameters as $field => $value) {
@@ -35,10 +36,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');
                     break;
 
                 case 'employee_id':
@@ -77,7 +75,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) : MasterTaskProjectCalendarResource::collection($mastertasks)
         ], 200);
     }
 

be/app/Http/Resources/MasterTaskProjectCalendarResource.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MasterTaskProjectCalendarResource 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,
+            'deadline'     => $this->deadline,
+            'starts_at'    => $this->created_at,
+            'is_finished'  => $this->is_finished,
+            
+        ];
+    }
+}

be/app/Http/Resources/MasterTaskSimpleResource.php

@@ -10,15 +10,16 @@ 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,
+            'id'           => $this->id,
-            'name' => $this->title,
+            'name'         => $this->title,
-            'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name  : null,
+            'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null,
-            'color' => $this->color,
+            'color'        => $this->color,
         ];
     }
 }