From 47a521a83dccb5201a3bd899d52d728a7bdd7c84 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Wed, 15 Feb 2023 18:49:15 +0100 Subject: [PATCH] no message --- be/app/Http/Controllers/SubTaskController.php | 14 +++++--------- be/app/Models/SubTask.php | 3 +++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/be/app/Http/Controllers/SubTaskController.php b/be/app/Http/Controllers/SubTaskController.php index d303f29..04914c5 100644 --- a/be/app/Http/Controllers/SubTaskController.php +++ b/be/app/Http/Controllers/SubTaskController.php @@ -144,9 +144,9 @@ class SubTaskController extends Controller $subtask = $mastertask->subtasks()->create($request->all()['data']); // syncnutie timeblocks - if (!empty($data['data']['timeblocks'])) { + //if (!empty($data['data']['timeblocks'])) { $subtask->syncTimeblocks($data['data']['timeblocks']); - } + //} // upload attachmentu if ($request->file('data')) { @@ -184,15 +184,11 @@ class SubTaskController extends Controller $subtask->update($request->all()['data']); // syncnutie vykazu - if (!empty($data['data']['timesheets'])) { - $subtask->syncTimesheets($data['data']['timesheets']); - } + $subtask->syncTimesheets($data['data']['timesheets']); // syncnutie timeblocks - if (!empty($data['data']['timeblocks'])) { - $subtask->syncTimeblocks($data['data']['timeblocks']); - } - + $subtask->syncTimeblocks($data['data']['timeblocks']); + return response()->json([ 'message' => 'Subtask updated successfully', 'subtask' => new SubTaskResource($subtask) diff --git a/be/app/Models/SubTask.php b/be/app/Models/SubTask.php index bf55046..6739630 100644 --- a/be/app/Models/SubTask.php +++ b/be/app/Models/SubTask.php @@ -65,6 +65,9 @@ class SubTask extends Model public function syncTimeblocks(Array $timeblocks) { + if (empty($timeblocks)) { + return $this->timeblocks()->delete(); + } // pripravenie array na upsert $timeblocks = array_map(function($item) { $item['sub_task_id'] = $this->id;