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

be/app/Http/Controllers/SubTaskController.php

@@ -65,7 +65,7 @@ class SubTaskController extends Controller
         }
 
         return response()->json([
-            'subtasks' => $subtasks
+            'subtasks' => SubTaskResource::collection($subtasks)
         ], 200);
     }
 
@@ -188,7 +188,7 @@ class SubTaskController extends Controller
 
         // syncnutie timeblocks
         $subtask->syncTimeblocks($data['data']['timeblocks']);
-        
+
         return response()->json([
             'message' => 'Subtask updated successfully',
             'subtask' => new SubTaskResource($subtask)

be/app/Http/Resources/SubTaskResource.php

@@ -29,6 +29,7 @@ class SubTaskResource extends JsonResource
             'timeblocks' => TimeblockResource::collection($this->timeblocks),
             'timesheets' => TimesheetResource::collection($this->timesheets),
             'files' => AttachmentResource::collection($this->attachments),
+            'color' => $this->mastertask->color,
         ];
 
     }